Fix patchfile since it tried to patch Makefile instead of Makefile.in

Noticed by: YAPHR of linimon
This commit is contained in:
Edwin Groothuis 2007-09-19 04:37:10 +00:00
parent 4ca5f3607a
commit 95dce11a1c
2 changed files with 11 additions and 29 deletions

View file

@ -1,29 +0,0 @@
--- trophy/Makefile.orig Thu Jan 22 16:19:22 2004
+++ trophy/Makefile Thu Jan 22 16:46:00 2004
@@ -1,6 +1,6 @@
# Generated automatically from Makefile.in by configure.
-prefix = /usr/local
+prefix = ${PREFIX}
exec_prefix = ${prefix}
datadir = ${prefix}/share
bindir = ${exec_prefix}/bin
@@ -37,7 +37,8 @@
catrophy.o \
cawidget.o
#DATAFILES = resources.dat
-EXTERN_LIBS = -lclanCore -lclanSound -lclanDisplay -lclanApp -lHermes
+EXTERN_LIBS = -L$(LOCALBASE)/lib -lclanCore -lclanSound -lclanDisplay -lclanApp -lHermes $(PTHREAD_LIBS)
+INCLUDES = -I$(LOCALBASE)/include
all: trophy $(DATAFILES)
@@ -54,7 +55,7 @@
$(CXX) $(EXTERN_LIBS) -o trophy $(OBJF)
%.o : %.cpp
- $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -O3 -Wall -DPKGDATADIR=\"$(datadir)/trophy\" $< -o $@
+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(PTHREAD_CFLAGS) $(INCLUDES) -Wall -DPKGDATADIR=\"$(datadir)/trophy\" $< -o $@
%.dat : %.scr trophy
./trophy -datafile $< $@

View file

@ -0,0 +1,11 @@
--- trophy/Makefile.in.orig Wed Sep 19 14:30:23 2007
+++ trophy/Makefile.in Wed Sep 19 14:31:48 2007
@@ -56,7 +56,7 @@
$(CXX) $(EXTERN_LIBS) -o trophy $(OBJF)
%.o : %.cpp
- $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(HEADERS) -O0 -g -Wall -DPKGDATADIR=\"$(datadir)/trophy\" $< -o $@
+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(PTHREAD_CFLAGS) $(HEADERS) -O0 -g -Wall -DPKGDATADIR=\"$(datadir)/trophy\" $< -o $@
doc :
@echo "Building documentation"