diff options
| author | wiz <wiz> | 2005-07-24 14:31:55 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2005-07-24 14:31:55 +0000 |
| commit | c8b6ac9bb357ae6c188166b8c21b6244867dbbdd (patch) | |
| tree | 89fa7de3454bb19e8700fad1952c5d357b2052ac /games/wesnoth | |
| parent | f9b20fdb12652a79485ec6f5a747a4241d8634a5 (diff) | |
| download | pkgsrc-c8b6ac9bb357ae6c188166b8c21b6244867dbbdd.tar.gz | |
Use installation fix as it will be in next release.
Diffstat (limited to 'games/wesnoth')
| -rw-r--r-- | games/wesnoth/patches/patch-aa | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/games/wesnoth/patches/patch-aa b/games/wesnoth/patches/patch-aa index 5f732d34d5c..8eac0d1c3ae 100644 --- a/games/wesnoth/patches/patch-aa +++ b/games/wesnoth/patches/patch-aa @@ -1,15 +1,20 @@ -$NetBSD: patch-aa,v 1.3 2005/07/14 21:47:57 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2005/07/24 14:31:55 wiz Exp $ ---- Makefile.in.orig 2005-06-06 00:03:23.000000000 +0200 +--- Makefile.in.orig 2005-06-29 22:32:22.000000000 +0200 +++ Makefile.in -@@ -762,8 +762,8 @@ install-data-local: - @INSTALLDATA_TRUE@ srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - @INSTALLDATA_TRUE@ ( $(finddata) ) | while read p; do \ - @INSTALLDATA_TRUE@ $(w_preparefileinstall) \ --@INSTALLDATA_TRUE@ echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ --@INSTALLDATA_TRUE@ $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ -+@INSTALLDATA_TRUE@ echo $(install_sh_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ -+@INSTALLDATA_TRUE@ $(install_sh_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \ - @INSTALLDATA_TRUE@ done - @DUMMYLOCALES_TRUE@@INSTALLDATA_TRUE@ $(mkdir_p) "$(DESTDIR)$(pkgdatadir)/locales" - @DUMMYLOCALES_TRUE@@INSTALLDATA_TRUE@ if test -d "$(DESTDIR)$(pkgdatadir)/locales/C" ; then rm -r "$(DESTDIR)$(pkgdatadir)/locales/C" ; fi +@@ -267,12 +267,12 @@ bin_SCRIPTS = utils/wmlxgettext + findfilterflags = -name CVS -prune -o -name ".cvs*" -o -name ".\#*" -o -type d + @LITE_FALSE@findmoredata = ;find images music $(findfilterflags) -o -print + @LITE_TRUE@findmoredata = ;find images $(findfilterflags) -o -path "images/campaigns/*/story*" -o -path "images/campaigns/*/sotbe*" -o -print +-@LITE_FALSE@findmoredatadirs = find images music -type d -not \( -name CVS -prune \) -print +-@LITE_TRUE@findmoredatadirs = find images -type d -not \( -name CVS -prune -o -path "images/campaigns/*/story*" -o -path "images/campaigns/*/sotbe*" \) -print ++@LITE_FALSE@findmoredatadirs = find images music -type d ! \( -name CVS -prune \) -print ++@LITE_TRUE@findmoredatadirs = find images -type d ! \( -name CVS -prune -o -path "images/campaigns/*/story*" -o -path "images/campaigns/*/sotbe*" \) -print + finddata = (cd $(top_srcdir) && find data fonts sounds $(findfilterflags) -o -print \ + $(findmoredata) ) + +-finddatadirs = (cd $(top_srcdir) && find data fonts sounds -type d -not \( -name CVS -prune \) -print; $(findmoredatadirs) ) ++finddatadirs = (cd $(top_srcdir) && find data fonts sounds -type d ! \( -name CVS -prune \) -print; $(findmoredatadirs) ) + findnoinst = (cd $(top_srcdir) && find utils -name CVS -prune -o -name ".cvs*" -o -name ".\#*" -o -type d -o -print && find MANUAL*) + w_preparefileinstall = if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + case $$p in \ |