diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2003-08-01 19:05:26 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2003-08-01 19:05:26 +0000 |
| commit | eeb525ae706f46a302bfa1f0490137be94ddf512 (patch) | |
| tree | 9126e9920795877b36f53fc17e720cdfb9bc7249 /graphics/openproducer | |
| parent | 4b88ef06680668c2badf78a5aa99912c9bd40426 (diff) | |
Notes
Diffstat (limited to 'graphics/openproducer')
| -rw-r--r-- | graphics/openproducer/files/patch-Make::makedefs | 37 | ||||
| -rw-r--r-- | graphics/openproducer/files/patch-Make::makerules | 20 |
2 files changed, 32 insertions, 25 deletions
diff --git a/graphics/openproducer/files/patch-Make::makedefs b/graphics/openproducer/files/patch-Make::makedefs index 0f986e33541e..e76b96999594 100644 --- a/graphics/openproducer/files/patch-Make::makedefs +++ b/graphics/openproducer/files/patch-Make::makedefs @@ -1,27 +1,14 @@ ---- Make/makedefs.orig Sat Apr 19 02:07:23 2003 -+++ Make/makedefs Sat Jul 26 10:06:16 2003 -@@ -57,7 +57,7 @@ - -DGLX_GLXEXT_PROTOTYPES - INC = -I$(TOPDIR)/include - --CXXFLAGS = $(ARCHARGS) $(DOF) $(DEF) $(INC) -+CXXFLAGS = $(ARCHARGS) $(DOF) $(DEF) $(INC) %%CXXFLAGS%% - LDFLAGS = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib - OBJS = $(CXXFILES:.cpp=.o) \ - $(CFILES:.c=.o) \ -@@ -228,19 +228,23 @@ - - #### FreeBSD specific definitions - ifeq ($(OS),FreeBSD) -- ifeq (x$(CXX),x) -- CXX = g++ -- endif +--- Make/makedefs.orig Sat Apr 19 01:07:23 2003 ++++ Make/makedefs Tue Jul 29 19:22:15 2003 +@@ -232,15 +232,22 @@ + CXX = g++ + endif DEPARG = -MM - INC += -I/usr/local/include -I/usr/X11R6/include -+ INC += -I${LOCALBASE}/include -I${X11BASE}/include ++ INC += -I${LOCALBASE}/include -I${X11BASE}/include DEF += -W -Wall - OPTF = -O2 -+ OPTF = ++ OPTF = %%CXXFLAGS%% DBGF = -g SHARED = -shared ARCH = 32 @@ -29,14 +16,14 @@ - INST_SYS_PREFIX = /opt/X11R6 - INST_SHARE_PREFIX = /usr/share/Producer + INST_SYS_PREFIX = $(PREFIX) -+ INST_SHARE_PREFIX = $(INST_SYS_PREFIX)/share/openproducer ++ INST_SHARE_PREFIX = $(DATADIR) + LINKARGS = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib + INST_LOCATION = $(INST_SYS_PREFIX) + INST_SHARE = $(INST_SHARE_PREFIX) -+ INST_DEMOS = $(INST_LOCATION)/openproducer/bin -+ INST_SRC = $(INST_LOCATION)/openproducer/src -+ INST_DOC = $(INST_LOCATION)/openproducer/doc -+ INST_DATA = $(INST_SHARE)/openproducer/data ++ INST_DEMOS = $(EXAMPLESDIR)/bin ++ INST_SRC = $(EXAMPLESDIR)/src ++ INST_DOC = $(DOCSDIR) ++ INST_DATA = $(DATADIR) endif #### MacOS X specific definitions diff --git a/graphics/openproducer/files/patch-Make::makerules b/graphics/openproducer/files/patch-Make::makerules new file mode 100644 index 000000000000..1c632629078d --- /dev/null +++ b/graphics/openproducer/files/patch-Make::makerules @@ -0,0 +1,20 @@ +--- Make/makerules.orig Tue Jul 29 19:02:29 2003 ++++ Make/makerules Tue Jul 29 19:02:51 2003 +@@ -90,7 +90,7 @@ + $(EXEC:=.opt) : + @[ -d $(OPTDIR) ] || mkdir $(OPTDIR) + @cd $(OPTDIR); \ +- $(MAKE) -f ../GNUmakefile DOF=$(OPTF) TOPDIR=../${TOPDIR} \ ++ $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \ + THISDIR=../$(THISDIR)\ + MAKEDEPEND=Makedepend $(EXEC) + @$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link +@@ -99,7 +99,7 @@ + $(LIB:=.opt) : + @[ -d $(OPTDIR) ] || mkdir $(OPTDIR) + @cd $(OPTDIR);\ +- $(MAKE) -f ../$(MAKEFILE) DOF=$(OPTF) TOPDIR=../${TOPDIR} \ ++ $(MAKE) -f ../$(MAKEFILE) "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \ + THISDIR=../$(THISDIR)\ + MAKEDEPEND=Makedepend $(LIB) + $(MAKE) LNSRC=$(OPTDIR)/$(LIB).$(LIB_EXT) LNDEST=$(LIBINST)/$(LIB).$(OS)$(ARCH).$(LIB_EXT) __link |