[packages/povray.git] / povray-makefile_and_config.patch

diff -Nur povray31.orig/source/unix/makefile povray31/source/unix/makefile
--- povray31.orig/source/unix/makefile	Sat Jun 19 03:52:24 1999
+++ povray31/source/unix/makefile	Sat Oct  9 01:58:23 1999
@@ -51,7 +51,7 @@
 #CFLAGS      = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=586 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
 
 # Linux compiler flags, Pentium II optimized
-CFLAGS      = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=686 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
+CFLAGS      = $(OPT_FLAGS) -finline-functions -ffast-math -c -ansi -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC)
 
 # HPUX compiler flags
 #CFLAGS      = +O2 -finline-functions -c -Aa -D_HPUX_SOURCE -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
@@ -127,12 +127,12 @@
 #default: svga
 
 # Define the default POV-Ray library location
-POVLIBDIR = /usr/local/lib/povray31
+POVLIBDIR = /usr/share/povray31
 
 # Define the path under which you want POV-Ray files to be installed,
 # typically /usr/local/bin, though Linux distributions may wish to 
 # alter this to /usr/bin
-POVPATH = /usr/local
+POVPATH = /usr
 
 #----------------------------------------------------------------------
 # There should be no compelling reason to customize the makefile beyond
diff -Nur povray31.orig/source/unix/povrayrc povray31/source/unix/povrayrc
--- povray31.orig/source/unix/povrayrc	Sat May  1 12:54:55 1999
+++ povray31/source/unix/povrayrc	Sat Oct  9 02:11:49 1999
@@ -21,8 +21,8 @@
 ;; Search path for #include source files or command line ini files not\r
 ;; found in the current directory.  New directories are added to the\r
 ;; search path, up to a maximum of 25.\r
-Library_Path=/usr/local/lib/povray31			;; (+Ldir)\r
-Library_Path=/usr/local/lib/povray31/include\r
+Library_Path=/usr/share/povray31			;; (+Ldir)\r
+Library_Path=/usr/share/povray31/include\r
 \r
 \r
 ;; Image size.\r
Commit	Line	Data
e41a4994	1	diff -Nur povray31.orig/source/unix/makefile povray31/source/unix/makefile
	2	--- povray31.orig/source/unix/makefile Sat Jun 19 03:52:24 1999
	3	+++ povray31/source/unix/makefile Sat Oct 9 01:58:23 1999
	4	@@ -51,7 +51,7 @@
	5	#CFLAGS = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=586 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
	6
	7	# Linux compiler flags, Pentium II optimized
	8	-CFLAGS = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=686 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
a7c24ea9	9	+CFLAGS = $(OPT_FLAGS) -finline-functions -ffast-math -c -ansi -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC)
e41a4994	10
	11	# HPUX compiler flags
	12	#CFLAGS = +O2 -finline-functions -c -Aa -D_HPUX_SOURCE -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
	13	@@ -127,12 +127,12 @@
	14	#default: svga
	15
	16	# Define the default POV-Ray library location
	17	-POVLIBDIR = /usr/local/lib/povray31
	18	+POVLIBDIR = /usr/share/povray31
	19
	20	# Define the path under which you want POV-Ray files to be installed,
	21	# typically /usr/local/bin, though Linux distributions may wish to
	22	# alter this to /usr/bin
	23	-POVPATH = /usr/local
	24	+POVPATH = /usr
	25
	26	#----------------------------------------------------------------------
	27	# There should be no compelling reason to customize the makefile beyond
	28	diff -Nur povray31.orig/source/unix/povrayrc povray31/source/unix/povrayrc
	29	--- povray31.orig/source/unix/povrayrc Sat May 1 12:54:55 1999
	30	+++ povray31/source/unix/povrayrc Sat Oct 9 02:11:49 1999
	31	@@ -21,8 +21,8 @@
	32	;; Search path for #include source files or command line ini files not\r
	33	;; found in the current directory. New directories are added to the\r
	34	;; search path, up to a maximum of 25.\r
	35	-Library_Path=/usr/local/lib/povray31 ;; (+Ldir)\r
	36	-Library_Path=/usr/local/lib/povray31/include\r
	37	+Library_Path=/usr/share/povray31 ;; (+Ldir)\r
	38	+Library_Path=/usr/share/povray31/include\r
	39	\r
	40	\r
	41	;; Image size.\r