converted the gawk-3.1.4-datadir-1.patch for the new gawk release -- Ferry Huberts
=======
Submitted By: Ferry Huberts (ferry at hupie dot com)
Date: 2005-09-06
Initial Package Version: 3.1.5
Origin: LFS PATCH
Upstream Status: Not submitted - LFS Specific
Description: Create a unique datadir instead of using awk.
8-24-04 - Made generic to work with future versions of gawk
9-06-05 - Convert patch to 3.1.5 release
diff -urN gawk-3.1.5-clean/Makefile.in gawk-3.1.5/Makefile.in
--- gawk-3.1.5-clean/Makefile.in 2005-07-26 20:44:03.000000000 +0200
+++ gawk-3.1.5/Makefile.in 2005-09-06 14:14:00.000000000 +0200
@@ -141,7 +141,6 @@
distcleancheck_listfiles = find . -type f -print
# Directory for gawk's data files. Automake supplies datadir.
-pkgdatadir = $(datadir)/awk
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
@@ -190,6 +189,7 @@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
+pkgdatadir = $(datadir)/gawk-$(PACKAGE_VERSION)
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
RANLIB = @RANLIB@
diff -urN gawk-3.1.5-clean/awklib/Makefile.in gawk-3.1.5/awklib/Makefile.in
--- gawk-3.1.5-clean/awklib/Makefile.in 2005-07-26 20:44:01.000000000 +0200
+++ gawk-3.1.5/awklib/Makefile.in 2005-09-06 14:17:12.000000000 +0200
@@ -103,7 +103,6 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgdatadir = $(datadir)/awk
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
@@ -152,6 +151,7 @@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
+pkgdatadir = $(datadir)/gawk-$(PACKAGE_VERSION)
PATH_SEPARATOR = @PATH_SEPARATOR@
POSUB = @POSUB@
RANLIB = @RANLIB@
@@ -495,7 +495,9 @@
# pkglibexecdir and pkgdatadir are removed in the top level Makefile's
uninstall
uninstall-local:
- rm -fr $(DESTDIR)$(pkglibexecdir)/* $(DESTDIR)$(pkgdatadir)/*
+ rm -f $(DESTDIR)$(pkglibexecdir)/grcat
+ rm -f $(DESTDIR)$(pkglibexecdir)/pwcat
+ rm -fr $(DESTDIR)$(pkgdatadir)
rm -f $(DESTDIR)$(bindir)/igawk
clean-local:
gawk-3.1.5-datadir-1.patch
Description: Binary data
-- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
