From 95dce11a1c3058f4887ff552af1c7e131b2e994d Mon Sep 17 00:00:00 2001 From: Edwin Groothuis Date: Wed, 19 Sep 2007 04:37:10 +0000 Subject: Fix patchfile since it tried to patch Makefile instead of Makefile.in Noticed by: YAPHR of linimon --- games/trophy/files/patch-trophy::Makefile | 29 ---------------------------- games/trophy/files/patch-trophy__Makefile.in | 11 +++++++++++ 2 files changed, 11 insertions(+), 29 deletions(-) delete mode 100644 games/trophy/files/patch-trophy::Makefile create mode 100644 games/trophy/files/patch-trophy__Makefile.in (limited to 'games/trophy') diff --git a/games/trophy/files/patch-trophy::Makefile b/games/trophy/files/patch-trophy::Makefile deleted file mode 100644 index c8a841676432..000000000000 --- a/games/trophy/files/patch-trophy::Makefile +++ /dev/null @@ -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 $< $@ diff --git a/games/trophy/files/patch-trophy__Makefile.in b/games/trophy/files/patch-trophy__Makefile.in new file mode 100644 index 000000000000..4b708730d6d8 --- /dev/null +++ b/games/trophy/files/patch-trophy__Makefile.in @@ -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" -- cgit v1.2.3