Ticket #18250: patch-Imakefile.diff
File patch-Imakefile.diff, 2.4 KB (added by jjstickel@…, 16 years ago) |
---|
-
patch-Imakefile
old new 1 --- Imakefile.orig 2007-11-07 09:35:59.000000000 +01002 +++ Imakefile 200 7-11-07 09:37:22.000000000 +01003 @@ -30,9 +30,1 0@@1 --- Imakefile.orig~ 2006-10-10 17:19:22.000000000 -0600 2 +++ Imakefile 2009-01-30 14:15:10.000000000 -0700 3 @@ -30,9 +30,12 @@ 4 4 XCOMM Also, you may have to uncomment and redefine MKDIRHIER because "make" looks 5 5 XCOMM for it relative to the BINDIR variable. 6 6 XCOMM … … 11 11 +DESTDIR = __DESTROOT 12 12 +MKDIRHIER = /bin/sh /usr/X11R6/bin/mkdirhier 13 13 +XCOMM MKDIRHIER = mkdirhier 14 + 15 +EXTRA_LDOPTIONS = -L__PREFIX/lib 14 16 15 17 XCOMM Uncomment and change XAPPLOADDIR to the directory where you want the 16 18 XCOMM app-defaults resource files to go. You will have to use the environment 17 @@ -45,7 +4 6,7 @@19 @@ -45,7 +48,7 @@ 18 20 XCOMM different tree than the "correct" tree that your X system expects. The usual 19 21 XCOMM purpose of DESTDIR is to test an install process by installing in a benign area. 20 22 … … 23 25 24 26 XCOMM Uncomment the following definition for XAW3D if you want to use 25 27 XCOMM the 3d Athena Widget Set (highly recommended!) 26 @@ -55,11 +5 6,11 @@28 @@ -55,11 +58,11 @@ 27 29 XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has 28 30 XCOMM some new features, including "Tips", which replace xfig's "help balloons" 29 31 … … 37 39 #else 38 40 XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c 39 41 XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o 40 @@ -72,9 +7 3,9 @@42 @@ -72,9 +75,9 @@ 41 43 XCOMM Redefine the following if your PNG library, zlib library and/or include file 42 44 XCOMM are in different places 43 45 … … 50 52 51 53 XCOMM If don't want JPEG support, comment out the #define USEJPEG line 52 54 XCOMM Uncomment the #define for USEJPEG if you want to be able to import 53 @@ -93,8 +9 4,8 @@55 @@ -93,8 +96,8 @@ 54 56 55 57 #ifdef USEJPEG 56 58 #ifdef USEINSTALLEDJPEG … … 61 63 #else 62 64 JPEGLIBDIR = ../jpeg 63 65 JPEGINC = -I$(JPEGLIBDIR) 64 @@ -116,8 +11 7,8 @@66 @@ -116,8 +119,8 @@ 65 67 #define USEXPM_ICON 66 68 67 69 #ifdef USEXPM … … 72 74 #endif 73 75 74 76 XCOMM Uncomment the following definiton if you want to use the small icons 75 @@ -166,16 +16 7,16 @@77 @@ -166,16 +169,16 @@ 76 78 XCOMM XFIGLIBDIR = $(LIBDIR) 77 79 78 80 XCOMM use this if you want the multi-key data base file in the standard X11 tree