[packages/crawl.git] / crawl-makefile.patch

diff -ruN cr400beta22-srcdupa/source/makefile.lnx cr400beta22-src/source/makefile.lnx
--- cr400beta22-srcdupa/source/makefile.lnx	Wed Dec 19 15:02:16 2001
+++ cr400beta22-src/source/makefile.lnx	Thu Jan 31 17:28:31 2002
@@ -13,11 +13,11 @@
 DELETE = rm -f
 COPY = cp
 OS_TYPE = LINUX
-CFLAGS = -Wall -g -D$(OS_TYPE) $(EXTRA_FLAGS)
-LDFLAGS = -static -L/usr/lib
+CFLAGS = -Wall -D$(OS_TYPE) $(EXTRA_FLAGS)
+LDFLAGS =
 MCHMOD = 2755
-# INSTALLDIR = /usr/games
-INSTALLDIR = /opt/crawl/bin
+INSTALLDIR = $(DESTDIR)/usr/games
+#INSTALLDIR = /opt/crawl/bin
 LIB = -lncurses
 
 # Include for Linux
@@ -55,7 +55,7 @@
 	${CXX} -g -p ${LDFLAGS} $(INCLUDES) $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
 
 .cc.o:
-	${CXX} ${CFLAGS} -c $< ${INCLUDE}
+	${CXX} ${CFLAGS} -c $< ${INCLUDES}
 
 .h.cc:
 	touch $@
Commit	Line	Data
a9b9a753	1	diff -ruN cr400beta22-srcdupa/source/makefile.lnx cr400beta22-src/source/makefile.lnx
	2	--- cr400beta22-srcdupa/source/makefile.lnx Wed Dec 19 15:02:16 2001
	3	+++ cr400beta22-src/source/makefile.lnx Thu Jan 31 17:28:31 2002
	4	@@ -13,11 +13,11 @@
	5	DELETE = rm -f
	6	COPY = cp
	7	OS_TYPE = LINUX
	8	-CFLAGS = -Wall -g -D$(OS_TYPE) $(EXTRA_FLAGS)
	9	-LDFLAGS = -static -L/usr/lib
	10	+CFLAGS = -Wall -D$(OS_TYPE) $(EXTRA_FLAGS)
	11	+LDFLAGS =
	12	MCHMOD = 2755
	13	-# INSTALLDIR = /usr/games
	14	-INSTALLDIR = /opt/crawl/bin
	15	+INSTALLDIR = $(DESTDIR)/usr/games
	16	+#INSTALLDIR = /opt/crawl/bin
	17	LIB = -lncurses
	18
	19	# Include for Linux
	20	@@ -55,7 +55,7 @@
	21	${CXX} -g -p ${LDFLAGS} $(INCLUDES) $(CFLAGS) $(OBJECTS) -o $(GAME) $(LIB)
	22
	23	.cc.o:
	24	- ${CXX} ${CFLAGS} -c $< ${INCLUDE}
	25	+ ${CXX} ${CFLAGS} -c $< ${INCLUDES}
	26
	27	.h.cc:
	28	touch $@