Fixesv2.5.2

* po/Makefile.in.in: Adjust to work with automake 1.1x

4 files changed, 26 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index a1024635..bcd9b6eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 
 	* Makefile.cvs: Update to work with current autoconf scripts
 
+	* po/Makefile.in.in: Adjust to work with automake 1.1x
+
 2006-08-19  Bernhard Rosenkraenzer <bero@arklinux.org>
 
 	* po/*: Sync with translation project
diff --git a/Makefile.cvs b/Makefile.cvs
index a9b3abad..265bf3a9 100644
--- a/Makefile.cvs
+++ b/Makefile.cvs
@@ -9,7 +9,7 @@ grep-$(VERSION).tar:
 	rm -rf /tmp/grep-$(VERSION) && cp -aR $(SRCDIR) /tmp/grep-$(VERSION) && cd /tmp/grep-$(VERSION) && make -f Makefile.cvs cvs-clean && make -f Makefile.cvs && rm -rf autom4te.cache && (find . -type d -name CVS |xargs rm -rf) && cd .. && tar chf $(SRCDIR)/grep-$(VERSION).tar grep-$(VERSION)
 
 grep-$(VERSION).tar.lz: grep-$(VERSION).tar
-	lzip -9e grep-$(VERSION).tar
+	lzip -9ef grep-$(VERSION).tar
 
 grep-$(VERSION).tar.bz2: grep-$(VERSION).tar
 	bzip2 -9f grep-$(VERSION).tar
diff --git a/grep.spec b/grep.spec
index b059d507..89875c49 100644
--- a/grep.spec
+++ b/grep.spec
@@ -4,23 +4,23 @@ Summary: The GNU versions of grep pattern matching utilities.
 Name: grep
 Version: 2.5.2
 %if "%{beta}" != ""
-Release: 0.%{beta}.%{rel}
+Release: 0.%{beta}.%{rel}ark
 %else
-Release: %{rel}
+Release: %{rel}ark
 %endif
 License: GPL
 Group: Applications/Text
-Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}%{beta}.tar.bz2
+Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}%{beta}.tar.lz
 Prereq: /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: pcre
 Buildrequires: pcre-devel
 
 %description
-The GNU versions of commonly used grep utilities.  The grep command
-searches through textual input for lines which contain a match to a
-specified pattern and then prints the matching lines.  The GNU grep
-utilities include grep, egrep, and fgrep.
+The GNU versions of commonly used grep utilities.  Grep searches
+through textual input for lines which contain a match to a specified
+pattern and then prints the matching lines.  GNU's grep utilities
+include grep, egrep and fgrep.
 
 You should install grep on your system, because it is a very useful
 utility for searching through text.
@@ -30,16 +30,17 @@ utility for searching through text.
 
 %build
 [ ! -e configure ] && ./autogen.sh
-%configure --prefix=%_prefix --without-included-regex
+%configure --without-included-regex
 make %?_smp_mflags
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-%makeinstall LDFLAGS=-s prefix=${RPM_BUILD_ROOT}%{_prefix} exec_prefix=${RPM_BUILD_ROOT}
+#makeinstall LDFLAGS=-s prefix=${RPM_BUILD_ROOT}%{_prefix} exec_prefix=${RPM_BUILD_ROOT}
+make install DESTDIR="$RPM_BUILD_ROOT"
 %ifos Linux
 mkdir -p $RPM_BUILD_ROOT/bin
-mv $RPM_BUILD_ROOT%{_prefix}/bin/* $RPM_BUILD_ROOT/bin
-rm -rf $RPM_BUILD_ROOT%{_prefix}/bin
+mv $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT/bin
+rm -rf $RPM_BUILD_ROOT%{_bindir}
 %endif
 
 %find_lang %name
@@ -62,11 +63,14 @@ fi
 %ifos Linux
 /bin/*
 %else
-%{_prefix}/bin/*
+%{_bindir}/*
 %endif
-%{_infodir}/*.info.gz
+%{_infodir}/*.info*
 %{_mandir}/*/*
 
 %changelog
-* Sat Nov 25 2006 Bernhard Rosenkraenzer <bero@arklinux.org> 2.5.2-1
+* Sat Nov 25 2006 Bernhard Rosenkraenzer <bero@arklinux.org> 2.5.2-1ark
 - 2.5.2
+
+* Mon Nov 29 2004 Bernhard Rosenkraenzer <bero@arklinux.org> 2.5.1a-1ark
+- 2.5.1a
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index c74ca17a..f53d47c0 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -34,6 +34,8 @@ GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
 MSGFMT = @MSGFMT@
 XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
 MSGMERGE = PATH=../src:$$PATH msgmerge
+MKDIR_P = @MKDIR_P@
+mkdir_p = @mkdir_p@
 
 DEFS = @DEFS@
 CFLAGS = @CFLAGS@
@@ -110,11 +112,7 @@ install-exec:
 install-data: install-data-@USE_NLS@
 install-data-no: all
 install-data-yes: all
-	if test -r "$(MKINSTALLDIRS)"; then \
-	  $(MKINSTALLDIRS) $(DESTDIR)/$(datadir); \
-	else \
-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir); \
-	fi
+	$(mkdir_p) $(DESTDIR)/$(datadir)
 	@catalogs='$(CATALOGS)'; \
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
@@ -124,11 +122,7 @@ install-data-yes: all
 	  esac; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 	  dir=$$destdir/$$lang/LC_MESSAGES; \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(DESTDIR)/$$dir; \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)/$$dir; \
-	  fi; \
+	  $(mkdir_p) $(DESTDIR)/$$dir; \
 	  if test -r $$cat; then \
 	    $(INSTALL_DATA) $$cat $(DESTDIR)/$$dir/$(PACKAGE)$(INSTOBJEXT); \
 	    echo "installing $$cat as $(DESTDIR)/$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
@@ -152,11 +146,7 @@ install-data-yes: all
 	  fi; \
 	done
 	if test "$(PACKAGE)" = "gettext"; then \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(DESTDIR)/$(gettextsrcdir); \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(gettextsrcdir); \
-	  fi; \
+	  $(mkdir_p) $(DESTDIR)/$(gettextsrcdir); \
 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
 			  $(DESTDIR)/$(gettextsrcdir)/Makefile.in.in; \
 	else \