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

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/10/19 20:48:21

Modified files:
        .              : configure.ac Makefile.am 

Log message:
        fixed stuff so that calling configure from a different place actually 
works

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/configure.ac.diff?tr1=1.96&tr2=1.97&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/Makefile.am.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: wesnoth/Makefile.am
diff -u wesnoth/Makefile.am:1.15 wesnoth/Makefile.am:1.16
--- wesnoth/Makefile.am:1.15    Sun Oct 10 23:11:54 2004
+++ wesnoth/Makefile.am Tue Oct 19 20:48:21 2004
@@ -10,8 +10,9 @@
 findmoredata=;find images music $(extrawesnothdatadirs) $(findfilterflags) -o 
-print
 endif
 
-finddata=find data fonts sounds $(extrawesnothdatadirs) $(findfilterflags) -o 
-print \
-        $(findmoredata)
+finddata=(cd $(top_srcdir) && find data fonts sounds $(extrawesnothdatadirs) 
$(findfilterflags) -o -print \
+        $(findmoredata) )
+findnoinst=(cd $(top_srcdir) && find utils -name CVS -prune -o -name ".cvs*" 
-o -name ".\#*" -o -type d -o -print && find MANUAL*)
 
 install-data-local:
        @$(NORMAL_INSTALL)
@@ -39,10 +40,9 @@
        done
 dist-hook:
        srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-       ( $(finddata) ) | tar cf - -T - | (cd $(distdir) && tar xf -)
+       ( $(finddata); $(findnoinst) ) | (cd $(top_srcdir) && tar cf - -T -) | 
(cd $(distdir) && tar xf -)
 
-dist_noinst_DATA = @MANUAL_FILES@ copyright changelog wesnoth.dsp wesnoth.dsw \
-       @UTIL_FILES@
+dist_noinst_DATA = copyright changelog wesnoth.dsp wesnoth.dsw
 dist_man6_MANS = doc/man/wesnoth.6 doc/man/wesnothd.6 doc/man/wesnoth_editor.6
 
 uninstall-hook:
Index: wesnoth/configure.ac
diff -u wesnoth/configure.ac:1.96 wesnoth/configure.ac:1.97
--- wesnoth/configure.ac:1.96   Sun Oct 17 13:09:24 2004
+++ wesnoth/configure.ac        Tue Oct 19 20:48:20 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.96 $])
+AC_REVISION([$Revision: 1.97 $])
 
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([foreign 1.5])
@@ -612,22 +612,15 @@
 # Data file substitution.                                             #
 #######################################################################
 
-MANUAL_FILES=`ls MANUAL*`
-MANUAL_FILES=`echo $MANUAL_FILES`
 AM_CONDITIONAL([LITE], [test "x$lite" = "xyes"])
 if test "x$lite" = "xyes"; then
     PACKAGE=$PACKAGE-lite
 fi
-UTIL_FILES=`find utils -name CVS -prune -o -name ".cvs*" -o -name ".#*" -o 
-type d -o -print`
-UTIL_FILES=`echo $UTIL_FILES`
-
-AC_SUBST([MANUAL_FILES])
 AC_SUBST([DATA_FILES])
 AC_SUBST([FONT_FILES])
 AC_SUBST([IMAGE_FILES])
 AC_SUBST([MUSIC_FILES])
 AC_SUBST([SOUND_FILES])
-AC_SUBST([UTIL_FILES])
 
 
 AC_CONFIG_FILES([Makefile