Navigation

← Previous Changeset
Next Changeset →

Changeset 281

Timestamp:

07/04/07 21:07:53 (1 year ago)

Author:

takkaria

Message:

Make autoconf work on single-user installs again. (closes #173)

Files:

trunk/configure.ac (modified) (4 diffs)
trunk/lib/apex/Makefile (modified) (1 diff)
trunk/lib/bone/Makefile (modified) (1 diff)
trunk/lib/data/Makefile (modified) (1 diff)
trunk/lib/save/Makefile (modified) (1 diff)
trunk/lib/xtra/font/Makefile (modified) (2 diffs)
trunk/mk/objective.mk (modified) (2 diffs)
trunk/src/Makefile (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/configure.ac

r201	r281
29	29	[ --with-setgid=NAME install angband as group NAME],
30	30	[case "${withval}" in
31		no) SETEGID="~~games~~";;
	31	no) SETEGID="";;
32	32	yes) AC_MSG_ERROR(missing argument for --with-setgid);;
33	33	*) SETEGID="$withval";;
…	…
38	38
39	39	dnl generate the installation path for the ./lib/ folder
40		if test "$~~GAMEGROUP~~" != ""; then
	40	if test "$SETEGID" != ""; then
41	41	MY_EXPAND_DIR(game_datadir, "$datadir/$PACKAGE/")
42	42	else
…	…
61	61	dnl Frontends
62	62	AC_ARG_ENABLE(gtk,
63		[ --enable-gtk Enables GTK 2.x frontend (default: disabled)],
	63	[ --enable-gtk Enables GTK 2.x frontend, can't use on system-wide installs (default: disabled)],
64	64	[enable_gtk=$enableval],
65	65	[enable_gtk=yes])
…	…
165	165	)
166	166
	167	if [ "x$SETEGID" != "x"]; then
	168	enable_gtk=no
	169	with_gtk=no
	170	fi
	171
167	172	if test "$with_gtk" = "yes"; then
168	173	AC_DEFINE(USE_GTK, 1, [Define to 1 if using the GTK+ 2.x interface and GTK+ 2.x is found.])

trunk/lib/apex/Makefile

r74	r281
10	10
11	11	install-posthook:
12		touch ${DATA_PATH}/apex/scores.raw
13		chown -R root:${SETEGID} ${DATA_PATH}/apex
14		chmod -R g+w ${DATA_PATH}/apex
	12	if [ "x$(SETEGID)" != "x" ]; then \
	13	printf "%10s %-20s\n" TOUCH ${DATA_PATH}/apex/scores.raw; \
	14	if [ "x$(DRY)" = "x" ]; then \
	15	touch ${DATA_PATH}/apex/scores.raw; \
	16	chown -R root:${SETEGID} ${DATA_PATH}/apex; \
	17	chmod -R g+w ${DATA_PATH}/apex; \
	18	fi; \
	19	fi;

trunk/lib/bone/Makefile

r74	r281
8	8
9	9	install-posthook:
10		chown root:${SETEGID} ${DATA_PATH}/bone
11		chmod 070 ${DATA_PATH}/bone
	10	if [ "x$(SETEGID)" != "x" ]; then \
	11	if [ "x$(DRY)" = "x" ]; then \
	12	chown root:${SETEGID} ${DATA_PATH}/bone; \
	13	chmod 070 ${DATA_PATH}/bone; \
	14	fi; \
	15	fi

trunk/lib/data/Makefile

r228	r281
13	13
14	14	install-posthook:
15		touch ${DATA_PATH}/data/artifact.raw
16		touch ${DATA_PATH}/data/cost_adj.raw
17		touch ${DATA_PATH}/data/ego_item.raw
18		touch ${DATA_PATH}/data/flavor.raw
19		touch ${DATA_PATH}/data/limits.raw
20		touch ${DATA_PATH}/data/monster.raw
21		touch ${DATA_PATH}/data/object.raw
22		touch ${DATA_PATH}/data/p_class.raw
23		touch ${DATA_PATH}/data/p_hist.raw
24		touch ${DATA_PATH}/data/p_race.raw
25		touch ${DATA_PATH}/data/prices.raw
26		touch ${DATA_PATH}/data/shop_own.raw
27		touch ${DATA_PATH}/data/terrain.raw
28		touch ${DATA_PATH}/data/vault.raw
29		chown -R root:${SETEGID} ${DATA_PATH}/data
30		chmod -R g+w ${DATA_PATH}/data
	15	if [ "x$(SETEGID)" != "x" ]; then \
	16	printf "%10s %s*.raw\n" TOUCH ${DATA_PATH}/data/; \
	17	if [ "x$(DRY)" = "x" ]; then \
	18	touch ${DATA_PATH}/data/artifact.raw; \
	19	touch ${DATA_PATH}/data/cost_adj.raw; \
	20	touch ${DATA_PATH}/data/ego_item.raw; \
	21	touch ${DATA_PATH}/data/flavor.raw; \
	22	touch ${DATA_PATH}/data/limits.raw; \
	23	touch ${DATA_PATH}/data/monster.raw; \
	24	touch ${DATA_PATH}/data/object.raw; \
	25	touch ${DATA_PATH}/data/p_class.raw; \
	26	touch ${DATA_PATH}/data/p_hist.raw; \
	27	touch ${DATA_PATH}/data/p_race.raw; \
	28	touch ${DATA_PATH}/data/prices.raw; \
	29	touch ${DATA_PATH}/data/shop_own.raw; \
	30	touch ${DATA_PATH}/data/terrain.raw; \
	31	touch ${DATA_PATH}/data/vault.raw; \
	32	chown -R root:${SETEGID} ${DATA_PATH}/data; \
	33	chmod -R g+w ${DATA_PATH}/data; \
	34	fi; \
	35	fi

trunk/lib/save/Makefile

r74	r281
1	1	include ../../mk/rules.mk
2	2	include ../../mk/init.mk
	3	include ../../mk/objective.mk
3	4
4	5	OBJECTIVE_DATA = \
5	6	delete.me:${DATA_PATH}/save
6	7
7		~~include ../../mk/objective.mk~~
8
9	8	install-posthook:
10		chown root:${SETEGID} ${DATA_PATH}/save
11		chmod 070 ${DATA_PATH}/save
	9	if [ "x$(SETEGID)" != "x" ]; then \
	10	if [ "x$(DRY)" = "x" ]; then \
	11	chown root:${SETEGID} ${DATA_PATH}/save; \
	12	chmod 070 ${DATA_PATH}/save; \
	13	fi; \
	14	fi

trunk/lib/xtra/font/Makefile

r162	r281
1	1	include ../../../mk/rules.mk
2	2	include ../../../mk/init.mk
	3	include ../../../mk/objective.mk
3	4
4	5	OBJECTIVE_DATA = \
…	…
25	26	12x24.fon:${DATA_PATH}/xtra/font \
26	27	16x25b.fon:${DATA_PATH}/xtra/font \
27		16x25.fon:${DATA_PATH}/xtra/font \
28
29
30		include ../../../mk/objective.mk
	28	16x25.fon:${DATA_PATH}/xtra/font

trunk/mk/objective.mk

r182	r281
7	7	$(MAKE) install-prehook
8	8	@for i in $(BINDIR) $(LIBDIR) $(INCLUDEDIR); do \
9		if [ ! -d $(DESTDIR)/$$i ]; then \
10		$(INSTALL) -d -m 755 $(DESTDIR)/$$i; \
	9	if [ ! -d $(DESTDIR)$$i ]; then \
	10	$(INSTALL) -d -m 755 $(DESTDIR)$$i; \
11	11	fi; \
12	12	done;
13		~~@if [ "x$(OVERLAYS)" != "x" ]; then \~~
14		~~for i in `find $(OVERLAYS) -type d -maxdepth 1 -mindepth 1`; do \~~
15		~~if [ $(VERBOSITY) -gt 0 ]; then \~~
16		~~echo "[installing overlay: $$i]"; \~~
17		~~fi; \~~
18		~~cd $$i; OVERLAYS="" $(MAKE) install \|\| exit; cd ..; \~~
19		~~done; \~~
20		fi
21	13	@if [ "x$(SUBDIRS)" != "x" ]; then \
22	14	for i in $(SUBDIRS); do \
…	…
30	22	for i in $(OBJECTIVE_DIRECTORIES); do \
31	23	printf "%10s %-20s\n" MKDIR $$i; \
32		$(INSTALL) -d -m 755 $(DESTDIR)/$$i; \
33		done; \
34		fi
35		@if [ "x$(HEADERS)" != "x" ]; then \
36		for i in $(HEADERS); do \
37		printf "%10s %-20s\n" INSTALL $$i; \
38		$(INSTALL_DATA) $(INSTALL_OVERRIDE) $$i $(DESTDIR)/$(INCLUDEDIR)/$$i; \
39		done; \
40		fi
41		@if [ "x$(OBJECTIVE_LIBS)" != "x" ]; then \
42		for i in $(OBJECTIVE_LIBS); do \
43		printf "%10s %-20s\n" INSTALL $$i; \
44		$(INSTALL) $(INSTALL_OVERRIDE) $$i $(DESTDIR)/$(LIBDIR)/$$i; \
	24	$(INSTALL) -d -m 755 $(DESTDIR)$$i; \
45	25	done; \
46	26	fi
47	27	@if [ "x$(OBJECTIVE_BINS)" != "x" ]; then \
48	28	for i in $(OBJECTIVE_BINS); do \
49		printf "%10s %-20s\n" INSTALL $$i; \
50		$(INSTALL) $(INSTALL_OVERRIDE) $$i $(DESTDIR)/$(BINDIR)/$$i; \
51		done; \
52		fi;
	29	printf "%10s %-20s (-> $(DESTDIR)$(BINDIR))\n" INSTALL $$i; \
	30	if [ "x$(DRY)" = "x" ]; then \
	31	$(INSTALL) $(INSTALL_OVERRIDE) $$i $(DESTDIR)$(BINDIR)/$$i; \
	32	fi; \
	33	done; \
	34	fi
53	35	@if [ "x$(OBJECTIVE_DATA)" != "x" ]; then \
	36	if [ "x$(SETEGID)" != "x" ]; then \
54	37	for i in $(OBJECTIVE_DATA); do \
55	38	source=`echo $$i \| cut -d ":" -f1`; \
56	39	destination=`echo $$i \| cut -d ":" -f2`; \
57		if [ ! -d $(DESTDIR)/$$destination ]; then \
58		$(INSTALL) -d -m 755 $(DESTDIR)/$$destination; \
59		fi; \
60		printf "%10s %-20s\n" INSTALL $$source; \
61		$(INSTALL_DATA) $(INSTALL_OVERRIDE) $$source $(DESTDIR)/$$destination; \
62		done; \
	40	printf "%10s %-20s (-> $(DESTDIR)$$destination)\n" INSTALL $$source; \
	41	if [ "x$(DRY)" = "x" ]; then \
	42	if [ ! -d $(DESTDIR)$$destination ]; then \
	43	$(INSTALL) -d -m 755 $(DESTDIR)$$destination; \
	44	fi; \
	45	$(INSTALL_DATA) $(INSTALL_OVERRIDE) $$source $(DESTDIR)$$destination; \
	46	fi; \
	47	done; \
	48	fi; \
63	49	fi
64	50	$(MAKE) install-posthook

trunk/src/Makefile

r182	r281
14	14	OBJECTIVE_BINS = angband
15	15
16		CFLAGS += \
17		-I.
	16	CFLAGS += -I.
18	17
19	18	angband: $(OBJECTS)
20	19	$(CC) $(LDFLAGS) $(OBJECTS) $(LDADD) -o $@
21	20	@printf "%10s %-20s\n" LINK $@
22
23		~~localinstall: angband~~
24		~~@if test "${DATA_PATH}" != "./lib/"; then \~~
25		~~echo; \~~
26		~~echo "WARNING: data path is ${DATA_PATH}"; \~~
27		~~echo "If this isn't './lib/', your angband may not function correctly."; \~~
28		fi
29		~~cp angband ..~~

Navigation

Changeset 281

Legend:

Download in other formats: