102 lines
2.9 KiB
Text
102 lines
2.9 KiB
Text
--- Makefile.orig Thu Aug 26 14:08:51 1999
|
|
+++ Makefile Sun Sep 5 06:08:36 1999
|
|
@@ -8,11 +8,11 @@
|
|
# Compilation/installation vars (global for all following sections) |
|
|
#=====================================================================
|
|
#
|
|
-PREFIX = /usr/local
|
|
-X11PREFIX = /usr/X11R6
|
|
+#PREFIX = /usr/local
|
|
+X11PREFIX = ${X11BASE}
|
|
INCX11 = $(X11PREFIX)/include
|
|
LIBX11 = $(X11PREFIX)/lib
|
|
-INCFORMS = $(X11PREFIX)/include
|
|
+INCFORMS = $(X11PREFIX)/include/X11
|
|
LIBFORMS = $(X11PREFIX)/lib
|
|
MODEM_DEV = modem
|
|
MODEM_PATH = /dev/$(MODEM_DEV)
|
|
@@ -24,25 +24,25 @@
|
|
# Normal (i.e. SuSE-6.x) vars; for SuSE-5.x use the lines which
|
|
# DO NOT include -lcrypt in EXTRALIBS and -DGLIBC2 in EXTRADEFS.
|
|
#----------------------------------------------------------------
|
|
-BINX11 = $(X11PREFIX)/bin
|
|
-USRLOCAL = $(PREFIX)/bin
|
|
-SBINDIR = /usr/sbin
|
|
-VARRUN = /var/run
|
|
-USRLIBPPP = /etc/ppp
|
|
-OPTSDIR = /etc/ppp
|
|
-MANDIR = $(X11PREFIX)/man/man1
|
|
-ETCPPP = /etc/ppp
|
|
-INSTPPPDIR = $(ETCPPP)
|
|
-DESTDIR =
|
|
-GROUP = uucp
|
|
-GCCFLAGS = -Wall -O
|
|
-EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DGLIBC2
|
|
+#BINX11 = $(X11PREFIX)/bin
|
|
+#USRLOCAL = $(PREFIX)/bin
|
|
+#SBINDIR = /usr/sbin
|
|
+#VARRUN = /var/run
|
|
+#USRLIBPPP = /etc/ppp
|
|
+#OPTSDIR = /etc/ppp
|
|
+#MANDIR = $(X11PREFIX)/man/man1
|
|
+#ETCPPP = /etc/ppp
|
|
+#INSTPPPDIR = $(ETCPPP)
|
|
+#DESTDIR =
|
|
+#GROUP = uucp
|
|
+#GCCFLAGS = -Wall -O
|
|
+#EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DGLIBC2
|
|
#EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\"
|
|
-EXTRALIBS = -lcrypt
|
|
+#EXTRALIBS = -lcrypt
|
|
#EXTRALIBS =
|
|
-LINKX11 =
|
|
-LINKFORMS = -L$(LIBFORMS) -lforms
|
|
-INSTALL = install
|
|
+#LINKX11 =
|
|
+#LINKFORMS = -L$(LIBFORMS) -lforms
|
|
+#INSTALL = install
|
|
#
|
|
# Debian vars (if your Debian distribution is relatively
|
|
# old and does not use glibc2, use the lines which DO NOT
|
|
@@ -166,24 +166,24 @@
|
|
#
|
|
# NetBSD vars
|
|
#-------------
|
|
-#BINX11 = $(X11PREFIX)/bin
|
|
-#USRLOCAL = $(BINX11)
|
|
-#SBINDIR = /usr/sbin
|
|
-#VARRUN = /var/run
|
|
-#USRLIBPPP = $(PREFIX)/libexec
|
|
-#MANDIR = $(PREFIX)/man/man1
|
|
-#ETCPPP = /etc/ppp
|
|
-#OPTSDIR = $(ETCPPP)
|
|
+BINX11 = $(X11PREFIX)/bin
|
|
+USRLOCAL = $(BINX11)
|
|
+SBINDIR = /usr/sbin
|
|
+VARRUN = /var/run
|
|
+USRLIBPPP = $(PREFIX)/libexec
|
|
+MANDIR = $(PREFIX)/man/man1
|
|
+ETCPPP = /etc/ppp
|
|
+OPTSDIR = $(ETCPPP)
|
|
#INSTPPPDIR = $(ETCPPP)
|
|
-##INSTPPPDIR = $(PREFIX)/share/examples/xisp
|
|
-#DESTDIR =
|
|
-#GROUP = dialer
|
|
-#GCCFLAGS = -Wall -O
|
|
-#EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR
|
|
-#EXTRALIBS = -lcrypt
|
|
-#LINKX11 = -Wl,-R$(LIBX11)
|
|
-#LINKFORMS = -L$(LIBFORMS) -lforms
|
|
-#INSTALL = /usr/bin/install
|
|
+INSTPPPDIR = $(PREFIX)/share/examples/xisp
|
|
+DESTDIR =
|
|
+GROUP = dialer
|
|
+GCCFLAGS = -Wall -O
|
|
+EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR
|
|
+EXTRALIBS = -lcrypt
|
|
+LINKX11 = -Wl,-R$(LIBX11)
|
|
+LINKFORMS = -L$(LIBFORMS) -lforms
|
|
+INSTALL = /usr/bin/install
|
|
#
|
|
# FreeBSD vars
|
|
#-------------
|