Browse Source

various cleanups

Ralf S. Engelschall 23 years ago
parent
commit
ecf9f848ec
1 changed files with 6 additions and 9 deletions
  1. 6 9
      make/make.spec

+ 6 - 9
make/make.spec

@@ -32,7 +32,7 @@ Distribution: OpenPKG [CORE]
 Group:        Development
 License:      GPL
 Version:      3.80
-Release:      20021004
+Release:      20021010
 
 #   list of sources
 Source0:      ftp://ftp.gnu.org/gnu/make/make-%{version}.tar.gz
@@ -58,20 +58,17 @@ AutoReqProv:  no
     CFLAGS="%{l_cflags -O}" \
     ./configure \
         --prefix=%{l_prefix} \
+        --without-libiconv-prefix \
+        --without-libintl-prefix \
         --disable-nls
     %{l_make} %{l_mflags -O}
 
 %install
     rm -rf $RPM_BUILD_ROOT
-    %{l_shtool} subst -v \
-        -e "s;^\\(prefix *= *\\).*;\\1 $RPM_BUILD_ROOT%{l_prefix};" \
-        Makefile */Makefile
-    %{l_make} %{l_mflags} install \
-        prefix=$RPM_BUILD_ROOT%{l_prefix} \
-        exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
+    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+    rm -f  $RPM_BUILD_ROOT%{l_prefix}/info/dir
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/share
-    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2> /dev/null || true
+    strip  $RPM_BUILD_ROOT%{l_prefix}/bin/* 2>/dev/null || true
     ( cd $RPM_BUILD_ROOT%{l_prefix}
       ln bin/make bin/gmake
       ln man/man1/make.1 man/man1/gmake.1 )