0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Yann Dirson 2004-10-19 20:48:21 +00:00
parent b4111adba0
commit ea46856dc3
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile.am
View file

@ -10,8 +10,9 @@ else
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 @@ uninstall-local:
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:

7
configure.ac
View file

@ -612,22 +612,15 @@ done
# 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