View | Details | Raw Unified | Return to bug 55161
Collapse All | Expand All

(-)openproducer/files/patch-Make::makedefs (-25 / +12 lines)
Lines 1-27 Link Here
1 
--- Make/makedefs.orig	Sat Apr 19 02:07:23 2003
 1 
--- Make/makedefs.orig	Sat Apr 19 01:07:23 2003
2 
+++ Make/makedefs	Sat Jul 26 10:06:16 2003
 2 
+++ Make/makedefs	Tue Jul 29 19:22:15 2003
3 
@@ -57,7 +57,7 @@
 3 
@@ -232,15 +232,22 @@
4 
 			 -DGLX_GLXEXT_PROTOTYPES
 4 
       CXX               = g++
5 
 INC        = -I$(TOPDIR)/include
5 
     endif
6
7 
-CXXFLAGS   = $(ARCHARGS) $(DOF) $(DEF) $(INC)
8 
+CXXFLAGS   = $(ARCHARGS) $(DOF) $(DEF) $(INC) %%CXXFLAGS%%
9 
 LDFLAGS    = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib
10 
 OBJS       = $(CXXFILES:.cpp=.o) \
11 
 	     	 $(CFILES:.c=.o) \
12 
@@ -228,19 +228,23 @@
13
14 
 #### FreeBSD specific definitions
15 
 ifeq ($(OS),FreeBSD)
16 
-    ifeq (x$(CXX),x)
17 
-      CXX               = g++
18 
-    endif
19 
   DEPARG            = -MM
 6 
   DEPARG            = -MM
20 
-  INC               +=  -I/usr/local/include -I/usr/X11R6/include
 7 
-  INC               +=  -I/usr/local/include -I/usr/X11R6/include
21 
+  INC               += -I${LOCALBASE}/include -I${X11BASE}/include
 8 
+  INC               +=  -I${LOCALBASE}/include -I${X11BASE}/include
22 
   DEF               += -W -Wall
 9 
   DEF               += -W -Wall
23 
-  OPTF              = -O2
10 
-  OPTF              = -O2
24 
+  OPTF              =
 11 
+  OPTF              = %%CXXFLAGS%%
25 
   DBGF              = -g
12 
   DBGF              = -g
26 
   SHARED            = -shared
 13 
   SHARED            = -shared
27 
   ARCH              = 32
 14 
   ARCH              = 32
Lines 29-42 Link Here
29 
-  INST_SYS_PREFIX   = /opt/X11R6
 16 
-  INST_SYS_PREFIX   = /opt/X11R6
30 
-  INST_SHARE_PREFIX = /usr/share/Producer
 17 
-  INST_SHARE_PREFIX = /usr/share/Producer
31 
+  INST_SYS_PREFIX   = $(PREFIX)
 18 
+  INST_SYS_PREFIX   = $(PREFIX)
32 
+  INST_SHARE_PREFIX = $(INST_SYS_PREFIX)/share/openproducer
 19 
+  INST_SHARE_PREFIX = $(DATADIR)
33 
+  LINKARGS          = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib
 20 
+  LINKARGS          = -L${X11BASE}/lib -L${LOCALBASE}/lib -rpath ${LOCALBASE}/lib -rpath ${X11BASE}/lib
34 
+  INST_LOCATION     = $(INST_SYS_PREFIX)
 21 
+  INST_LOCATION     = $(INST_SYS_PREFIX)
35 
+  INST_SHARE        = $(INST_SHARE_PREFIX)
 22 
+  INST_SHARE        = $(INST_SHARE_PREFIX)
36 
+  INST_DEMOS        = $(INST_LOCATION)/openproducer/bin
 23 
+  INST_DEMOS        = $(EXAMPLESDIR)/bin
37 
+  INST_SRC          = $(INST_LOCATION)/openproducer/src
 24 
+  INST_SRC          = $(EXAMPLESDIR)/src
38 
+  INST_DOC          = $(INST_LOCATION)/openproducer/doc
 25 
+  INST_DOC          = $(DOCSDIR)
39 
+  INST_DATA         = $(INST_SHARE)/openproducer/data
 26 
+  INST_DATA         = $(DATADIR)
40 
 endif
 27 
 endif
41
28
42 
 #### MacOS X specific definitions
 29 
 #### MacOS X specific definitions
(-)openproducer/files/patch-Make::makerules (+20 lines)
Line 0 Link Here
1 
--- Make/makerules.orig	Tue Jul 29 19:02:29 2003
2 
+++ Make/makerules	Tue Jul 29 19:02:51 2003
3 
@@ -90,7 +90,7 @@
4 
 $(EXEC:=.opt) :
5 
 	@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
6 
 	@cd $(OPTDIR); \
7 
-      $(MAKE) -f ../GNUmakefile DOF=$(OPTF)  TOPDIR=../${TOPDIR} \
8 
+      $(MAKE) -f ../GNUmakefile "DOF=$(OPTF)"  TOPDIR=../${TOPDIR} \
9 
           THISDIR=../$(THISDIR)\
10 
           MAKEDEPEND=Makedepend $(EXEC)
11 
 	@$(MAKE) LNSRC=$(OPTDIR)/$(EXEC) LNDEST=$(BININST)/$(OS)$(ARCH)/$(EXEC) __link
12 
@@ -99,7 +99,7 @@
13 
 $(LIB:=.opt) :
14 
 	@[ -d $(OPTDIR) ] || mkdir $(OPTDIR)
15 
 	@cd $(OPTDIR);\
16 
-	  $(MAKE) -f ../$(MAKEFILE) DOF=$(OPTF) TOPDIR=../${TOPDIR} \
17 
+	  $(MAKE) -f ../$(MAKEFILE) "DOF=$(OPTF)" TOPDIR=../${TOPDIR} \
18 
 	        THISDIR=../$(THISDIR)\
19 
 	        MAKEDEPEND=Makedepend $(LIB)
20 
 	$(MAKE) LNSRC=$(OPTDIR)/$(LIB).$(LIB_EXT) LNDEST=$(LIBINST)/$(LIB).$(OS)$(ARCH).$(LIB_EXT) __link

Return to bug 55161