116 lines
3.9 KiB
Diff
116 lines
3.9 KiB
Diff
diff -ru ../xfig.3.2.5-alpha5.orig/Imakefile ./Imakefile
|
|
--- ../xfig.3.2.5-alpha5.orig/Imakefile 2006-05-06 20:56:58.000000000 -0600
|
|
+++ ./Imakefile 2006-05-06 21:02:09.000000000 -0600
|
|
@@ -30,8 +30,8 @@
|
|
XCOMM Also, you may have to uncomment and redefine MKDIRHIER because "make" looks
|
|
XCOMM for it relative to the BINDIR variable.
|
|
XCOMM
|
|
-XCOMM BINDIR = /usr/bin/X11
|
|
-XCOMM MKDIRHIER = /bin/sh /usr/bin/X11/mkdirhier -p
|
|
+BINDIR = /usr/bin
|
|
+MKDIRHIER = mkdirhier
|
|
|
|
XCOMM Uncomment and change XAPPLOADDIR to the directory where you want the
|
|
XCOMM app-defaults resource files to go. You will have to use the environment
|
|
@@ -44,12 +44,12 @@
|
|
XCOMM different tree than the "correct" tree that your X system expects. The usual
|
|
XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
|
|
|
|
-XCOMM XAPPLOADDIR = /home/user/xfig
|
|
+XAPPLOADDIR = /etc/X11/app-defaults
|
|
|
|
XCOMM Uncomment the following definition for XAW3D if you want to use
|
|
XCOMM the 3d Athena Widget Set (highly recommended!)
|
|
|
|
-XCOMM #define XAW3D
|
|
+#define XAW3D
|
|
|
|
XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has
|
|
XCOMM some new features, including "Tips", which replace xfig's "help balloons"
|
|
@@ -71,9 +71,9 @@
|
|
XCOMM Redefine the following if your PNG library, zlib library and/or include file
|
|
XCOMM are in different places
|
|
|
|
-PNGLIBDIR = $(USRLIBDIR)
|
|
-PNGINC = -I/usr/local/include
|
|
-ZLIBDIR = $(USRLIBDIR)
|
|
+PNGLIBDIR = /usr/lib
|
|
+PNGINC = -I/usr/include
|
|
+ZLIBDIR = /usr/lib
|
|
|
|
XCOMM If don't want JPEG support, comment out the #define USEJPEG line
|
|
XCOMM Uncomment the #define for USEJPEG if you want to be able to import
|
|
@@ -92,8 +92,8 @@
|
|
|
|
#ifdef USEJPEG
|
|
#ifdef USEINSTALLEDJPEG
|
|
-JPEGLIBDIR = /usr/local/lib
|
|
-JPEGINC = -I/usr/include/X11
|
|
+JPEGLIBDIR = /usr/lib
|
|
+JPEGINC = -I/usr/include
|
|
#else
|
|
JPEGLIBDIR = ../jpeg
|
|
JPEGINC = -I$(JPEGLIBDIR)
|
|
@@ -115,8 +115,8 @@
|
|
#define USEXPM_ICON
|
|
|
|
#ifdef USEXPM
|
|
-XPMLIBDIR = $(USRLIBDIR)
|
|
-XPMINC = -I/usr/include/X11
|
|
+XPMLIBDIR = /usr/X11R6/lib
|
|
+XPMINC = -I/usr/X11R6/include/X11
|
|
#endif
|
|
|
|
XCOMM Uncomment the following definiton if you want to use the small icons
|
|
@@ -157,19 +157,19 @@
|
|
XCOMM inline functions. With the "INLINE" keyword, you should notice that
|
|
XCOMM the display will be a bit faster in complex figures
|
|
|
|
-XCOMM USEINLINE = -DUSE_INLINE
|
|
+USEINLINE = -DUSE_INLINE
|
|
|
|
XCOMM use (and change) the following if you want the multi-key data base file
|
|
XCOMM somewhere other than the standard X11 library directory
|
|
XCOMM be sure to comment out the second copy of XFIGLIBDIR if you use this one
|
|
-XCOMM XFIGLIBDIR = /usr/local/lib/xfig
|
|
+XFIGLIBDIR = /usr/share/xfig
|
|
|
|
XCOMM use this if you want the multi-key data base file in the standard X11 tree
|
|
-XFIGLIBDIR = $(LIBDIR)/xfig
|
|
+XCOM XFIGLIBDIR = $(LIBDIR)/xfig
|
|
|
|
XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
|
|
XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
|
|
-XFIGDOCDIR = /usr/share/doc/xfig
|
|
+XFIGDOCDIR = /usr/share/xfig/doc
|
|
|
|
XCOMM MANDIR tells where the standard man pages should go (no need to change it
|
|
XCOMM if you want the man pages installed in the standard place on your system
|
|
diff -ru ../xfig.3.2.5-alpha5.orig/u_fonts.h ./u_fonts.h
|
|
--- ../xfig.3.2.5-alpha5.orig/u_fonts.h 2006-05-06 20:57:00.000000000 -0600
|
|
+++ ./u_fonts.h 2006-05-06 20:58:49.000000000 -0600
|
|
@@ -30,11 +30,6 @@
|
|
/* font number for the "nil" font (when user wants tiny text) */
|
|
#define NILL_FONT NUM_FONTS
|
|
|
|
-extern int psfontnum();
|
|
-extern int latexfontnum();
|
|
-extern struct _xfstruct x_fontinfo[], x_backup_fontinfo[];
|
|
-extern struct _fstruct ps_fontinfo[];
|
|
-extern struct _fstruct latex_fontinfo[];
|
|
|
|
/* element of linked list for each font
|
|
The head of list is for the different font NAMES,
|
|
@@ -61,5 +56,11 @@
|
|
* sizes */
|
|
};
|
|
|
|
+extern int psfontnum();
|
|
+extern int latexfontnum();
|
|
+extern struct _xfstruct x_fontinfo[], x_backup_fontinfo[];
|
|
+extern struct _fstruct ps_fontinfo[];
|
|
+extern struct _fstruct latex_fontinfo[];
|
|
+
|
|
int x_fontnum();
|
|
#endif /* U_FONTS_H */
|