[Wesnoth-cvs-commits] wesnoth Makefile.am configure.ac

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/09/01 19:07:18

Modified files:
        .              : Makefile.am configure.ac 

Log message:
        moved finding of data files from configure.ac to Makefile.am

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/Makefile.am.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.75&tr2=1.76&r1=text&r2=text

Patches:
Index: wesnoth/Makefile.am
diff -u wesnoth/Makefile.am:1.11 wesnoth/Makefile.am:1.12
--- wesnoth/Makefile.am:1.11    Sun Aug 15 20:25:06 2004
+++ wesnoth/Makefile.am Wed Sep  1 19:07:18 2004
@@ -2,10 +2,44 @@
 SUBDIRS = intl po m4 src $(ISUBDIRS)
 pkgdatadir=$(datadir)/@DATADIR@
 
+findfilterflags=-name CVS -prune -o -name ".cvs*" -o -name ".\#*" -o -type d
+
+if LITE
+findmoredata=;find images $(extrawesnothdatadirs) $(findfilterflags) -o -path 
"images/misc/tutorial*" -o -path "images/misc/story*" -o -print
+else
+findmoredata=;find images music $(extrawesnothdatadirs) $(findfilterflags) -o 
-print
+endif
+
+finddata=find data fonts sounds $(extrawesnothdatadirs) $(findfilterflags) -o 
-print \
+        $(findmoredata)
+
+install-data-local:
+       @$(NORMAL_INSTALL)
+       test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
+       srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       ( $(finddata) ) | while read p; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         case $$p in \
+           $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+           *) f=$$p;; \
+         esac; \
+         echo " $(install_sh_DATA) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+         $(install_sh_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
+       done
+uninstall-local:
+       @$(NORMAL_UNINSTALL)
+       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       ( $(finddata) ) | while read p; do \
+         case $$p in \
+           $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+           *) f=$$p;; \
+         esac; \
+         echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+         rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
+       done
+
 dist_noinst_DATA = @MANUAL_FILES@ copyright changelog wesnoth.dsp wesnoth.dsw \
        @UTIL_FILES@
-nobase_dist_pkgdata_DATA = @DATA_FILES@ @FONT_FILES@ @IMAGE_FILES@ \
-       @MUSIC_FILES@ @SOUND_FILES@
 dist_man6_MANS = doc/man/wesnoth.6 doc/man/wesnothd.6 doc/man/wesnoth_editor.6
 
 uninstall-hook:
@@ -26,7 +60,7 @@
        @cd $(BINARY_STAGING) ; tar cf - * | gzip -c >$(BINARY_DIST)
        @rm -rf $(BINARY_STAGING)
        @echo "Precompiled binary tarball is in $(BINARY_DIST)"
-    
+
 data-dist:
        @rm -rf $(BINARY_STAGING) $(DATA_DIST)
        @make install-data DESTDIR=$(BINARY_STAGING)
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.75 wesnoth/configure.ac:1.76
--- wesnoth/configure.ac:1.75   Fri Aug 27 19:54:54 2004
+++ wesnoth/configure.ac        Wed Sep  1 19:07:18 2004
@@ -10,7 +10,7 @@
 dnl AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org"], [The default 
server for this version])
 AC_DEFINE([WESNOTH_DEFAULT_SERVER], ["devsrv.wesnoth.org:14999"], [The default 
server for this version])
 
-AC_REVISION([$Revision: 1.75 $])
+AC_REVISION([$Revision: 1.76 $])
 
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([foreign 1.5])
@@ -525,22 +525,10 @@
 
 MANUAL_FILES=`ls MANUAL*`
 MANUAL_FILES=`echo $MANUAL_FILES`
-DATA_FILES=`find data -name CVS -prune -o -name ".cvs*" -o -name ".#*" -o 
-type d -o -print`
-DATA_FILES=`echo $DATA_FILES`
-FONT_FILES=`find fonts  -name CVS -prune -o -name ".cvs*" -o -name ".#*" -o 
-type d -o -print`
-FONT_FILES=`echo $FONT_FILES`
+AM_CONDITIONAL([LITE], [test "x$lite" = "xyes"])
 if test "x$lite" = "xyes"; then
     PACKAGE=$PACKAGE-lite
-    IMAGE_FILES=`find images -name CVS -prune -o -name ".cvs*" -o -name ".#*" 
-o -path "images/misc/tutorial*" -o -path "images/misc/story*" -o -type d -o 
-print`
-    MUSIC_FILES=""
-else
-    IMAGE_FILES=`find images -name CVS -prune -o -name ".cvs*" -o -name ".#*" 
-o -type d -o -print`
-    MUSIC_FILES=`find music -name CVS -prune -o -name ".cvs*" -o -name ".#*" 
-o -type d -o -print`
-    MUSIC_FILES=`echo $MUSIC_FILES`
 fi
-IMAGE_FILES=`echo $IMAGE_FILES`
-SOUND_FILES=`find sounds -name CVS -prune -o -name ".cvs*" -o -name ".#*" -o 
-type d -o -print`
-SOUND_FILES=`echo $SOUND_FILES`
 UTIL_FILES=`find utils -name CVS -prune -o -name ".cvs*" -o -name ".#*" -o 
-type d -o -print`
 UTIL_FILES=`echo $UTIL_FILES`