Attachment #114633 for bug #102615

Lines 128-137 Link Here

(-)Makefile.am.orig (-4 lines)
128	if test -z "$(AA_FAKE_UNINSTALL)"; then DESTDIR=$(DESTDIR) ROOTDIR=$(ROOTDIR) bash $(DESTDIR)${scriptdir}/sysinstall uninstall $(prefix); fi	128	if test -z "$(AA_FAKE_UNINSTALL)"; then DESTDIR=$(DESTDIR) ROOTDIR=$(ROOTDIR) bash $(DESTDIR)${scriptdir}/sysinstall uninstall $(prefix); fi
129	endif	129	endif
130		130
131	install-first:
132	# uninstall previous version (if it exists), ignoring errors
133	test -x $(uninstall_location) && $(uninstall_location) \|\| true
134
135	distclean-local:	131	distclean-local:
136	rm -f uninstall.sh batch/relocate.in universal_variable* extrapaths src/tUniversalVariables.h*	132	rm -f uninstall.sh batch/relocate.in universal_variable* extrapaths src/tUniversalVariables.h*

Lines 15644-15650 Link Here

(-)configure.orig (-2 / +1 lines)
15644		15644
15645		15645
15646		15646
15647	ac_config_files="$ac_config_files src/Makefile src/first/Makefile Makefile batch/Makefile language/languages.txt config/rc.config config/aiplayers.cfg src/doc/Makefile src/doc/net/Makefile src/doc/Doxyfile src/doc/html.m4 src/thirdparty/Makefile src/thirdparty/particles/Makefile resource/Makefile config/Makefile desktop/Makefile desktop/armagetronad.desktop"	15647	ac_config_files="$ac_config_files src/Makefile Makefile batch/Makefile language/languages.txt config/rc.config config/aiplayers.cfg src/doc/Makefile src/doc/net/Makefile src/doc/Doxyfile src/doc/html.m4 src/thirdparty/Makefile src/thirdparty/particles/Makefile resource/Makefile config/Makefile desktop/Makefile desktop/armagetronad.desktop"
15648	cat >confcache <<\_ACEOF	15648	cat >confcache <<\_ACEOF
15649	# This file is a shell script that caches the results of configure	15649	# This file is a shell script that caches the results of configure
15650	# tests run on this system so they can be shared between configure	15650	# tests run on this system so they can be shared between configure
Lines 16281-16287 Link Here
16281	case "$ac_config_target" in	16281	case "$ac_config_target" in
16282	# Handling of arguments.	16282	# Handling of arguments.
16283	"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;	16283	"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
16284	"src/first/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/first/Makefile" ;;
16285	"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;	16284	"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
16286	"batch/Makefile" ) CONFIG_FILES="$CONFIG_FILES batch/Makefile" ;;	16285	"batch/Makefile" ) CONFIG_FILES="$CONFIG_FILES batch/Makefile" ;;
16287	"language/languages.txt" ) CONFIG_FILES="$CONFIG_FILES language/languages.txt" ;;	16286	"language/languages.txt" ) CONFIG_FILES="$CONFIG_FILES language/languages.txt" ;;

Lines 1-5 Link Here

(-)src/Makefile.am.orig (-1 / +1 lines)
1	# include $(top_srcdir)/Makefile.paths	1	# include $(top_srcdir)/Makefile.paths
2	SUBDIRS = first doc thirdparty	2	SUBDIRS = doc thirdparty
3		3
4	# target directory	4	# target directory
5	gamesdir=${bindir}	5	gamesdir=${bindir}

Return to bug 102615