diff options
Diffstat (limited to 'cad/xcircuit/files/patch-aa')
| -rw-r--r-- | cad/xcircuit/files/patch-aa | 129 |
1 files changed, 51 insertions, 78 deletions
diff --git a/cad/xcircuit/files/patch-aa b/cad/xcircuit/files/patch-aa index 050a45a7d1d0..1869df9388a5 100644 --- a/cad/xcircuit/files/patch-aa +++ b/cad/xcircuit/files/patch-aa @@ -1,78 +1,51 @@ -*** Imakefile.orig Wed Jun 13 00:43:27 2001 ---- Imakefile Sat Jun 16 09:43:29 2001 -*************** -*** 28,46 **** - #CCOPTIONS = -O2 - # - # for debugging purposes uncomment the following line: -! CDEBUGFLAGS = -g -! STD_INCLUDES = -I. -I/usr/X11R6/include/X11 - - #------------------------------------------------------------------------ - # Installation directories: - # Change the following as desired to suit your environment: - #------------------------------------------------------------------------ - # -! PREFIX = /usr/local - # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles -! XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.3 -! XCIRCUIT_BIN_DIR = $(PREFIX)/bin -! XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1 - - #------------------------------------------------------------------------ - # Support for graphics double-buffering (A memory hog, but yields fastest ---- 28,47 ---- - #CCOPTIONS = -O2 - # - # for debugging purposes uncomment the following line: -! #CDEBUGFLAGS = -g -! STD_INCLUDES = -I. -I$(INCDIR)/X11 -! EXTRA_DEFINES = -DHAVE_DIRENT_H -DHAVE_PUTENV - - #------------------------------------------------------------------------ - # Installation directories: - # Change the following as desired to suit your environment: - #------------------------------------------------------------------------ - # -! #PREFIX = /usr/local - # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles -! XCIRCUIT_LIB_DIR = $(LIBDIR)/xcircuit -! XCIRCUIT_BIN_DIR = $(BINDIR) -! XCIRCUIT_MAN_DIR = $(MANDIR) - - #------------------------------------------------------------------------ - # Support for graphics double-buffering (A memory hog, but yields fastest -*************** -*** 58,64 **** - # Support for background rendering through ghostscript. Change this - # to the path where gs can be found. - # GS_EXEC= /usr/local/src/gs5.50/obj/gs -! GS_EXEC= /usr/bin/gs - - #------------------------------------------------------------------------ - # Window manager bug workaround---If you don't like xcircuit grabbing kbd ---- 59,65 ---- - # Support for background rendering through ghostscript. Change this - # to the path where gs can be found. - # GS_EXEC= /usr/local/src/gs5.50/obj/gs -! GS_EXEC=${LOCALBASE}/bin/gs - - #------------------------------------------------------------------------ - # Window manager bug workaround---If you don't like xcircuit grabbing kbd -*************** -*** 86,92 **** - # Support for embedded Python interpreter - # (requires libpython${PYTHON_VERSION}.a) - # -! #define HAVE_PYTHON - - PYTHON_VERSION=2.1 - PYTHON_LIB_DIR=/usr/local/lib ---- 87,93 ---- - # Support for embedded Python interpreter - # (requires libpython${PYTHON_VERSION}.a) - # -! /* #define HAVE_PYTHON */ - - PYTHON_VERSION=2.1 - PYTHON_LIB_DIR=/usr/local/lib +--- Imakefile.orig Fri Aug 31 21:56:34 2001 ++++ Imakefile Fri Aug 31 22:01:26 2001 +@@ -28,23 +28,23 @@ + #CCOPTIONS = -O2 + # + # for debugging purposes uncomment the following line: +-CDEBUGFLAGS = -g +-STD_INCLUDES = -I. -I/usr/X11R6/include/X11 ++# CDEBUGFLAGS = -g ++STD_INCLUDES = -I. -I$(INCDIR)/X11 + + # The "m4" macro processor is used to generate the man page such that + # the man page reflects the configured options. +-M4 = m4 ++M4 = gm4 + + #------------------------------------------------------------------------ + # Installation directories: + # Change the following as desired to suit your environment: + #------------------------------------------------------------------------ + # +-PREFIX = /usr/local ++# PREFIX = /usr/local + # XCIRCUIT_LIB_DIR = $(PREFIX)/src/xcircuit-2.3.1/psfiles +-XCIRCUIT_LIB_DIR = $(PREFIX)/lib/xcircuit-2.3 +-XCIRCUIT_BIN_DIR = $(PREFIX)/bin +-XCIRCUIT_MAN_DIR = $(PREFIX)/man/man1 ++XCIRCUIT_LIB_DIR = $(LIBDIR)/xcircuit ++XCIRCUIT_BIN_DIR = $(BINDIR) ++XCIRCUIT_MAN_DIR = $(MANDIR) + XAPPLRESDIR = ${XCIRCUIT_LIB_DIR}/app-defaults + + #------------------------------------------------------------------------ +@@ -63,7 +63,7 @@ + # Support for background rendering through ghostscript. Change this + # to the path where gs can be found. + # GS_EXEC= /usr/local/src/gs5.50/obj/gs +-GS_EXEC= /usr/bin/gs ++GS_EXEC=${LOCALBASE}/bin/gs + + #------------------------------------------------------------------------ + # Window manager bug workaround---If you don't like xcircuit grabbing kbd +@@ -91,7 +91,7 @@ + # Support for embedded Python interpreter + # (requires libpython${PYTHON_VERSION}.a) + # +-#define HAVE_PYTHON ++/* #define HAVE_PYTHON */ + + PYTHON_VERSION=2.1 + PYTHON_LIB_DIR=/usr/local/lib |