diff options
Diffstat (limited to 'deskutils/plan/files/patch-ab')
| -rw-r--r-- | deskutils/plan/files/patch-ab | 46 |
1 files changed, 22 insertions, 24 deletions
diff --git a/deskutils/plan/files/patch-ab b/deskutils/plan/files/patch-ab index 64d8c1f9288a..1178a576b1e7 100644 --- a/deskutils/plan/files/patch-ab +++ b/deskutils/plan/files/patch-ab @@ -1,39 +1,37 @@ ---- Makefile.orig Wed Mar 19 16:22:33 2003 -+++ Makefile Sun Mar 23 12:07:44 2003 -@@ -7,18 +7,26 @@ +--- Makefile.orig Tue Sep 30 13:52:26 2003 ++++ Makefile Wed Nov 12 11:40:42 2003 +@@ -7,18 +7,24 @@ # path and the #, or you'll get compile errors. DO NOT put blanks before and # after "=", this is parsed and rewritten by the configure script. # +DOCBASE=$(PREFIX)/share/doc/plan +# # # user-callable executable (plan) --DIR=/usr/local/bin -+DIR=$(PREFIX)/bin +-DIR=/usr/freeware/bin ++DIR=${PREFIX}/bin # # auxiliary programs (pland, notifier, PS) --LIB=/usr/local/lib -+LIB=$(PREFIX)/share -+# # Example holiday files +-LIB=/usr/freeware/lib ++LIB=${PREFIX}/share ++# # Example holiday files +EXAMPLES=$(DOCBASE)/examples -+# # doc files ++# # doc files +DOCS=$(DOCBASE) # # help file (plan.help) --SBIN=/usr/local/lib +-SBIN=/usr/freeware/bin +HELP=$(DOCBASE) -+# -+SBIN=$(PREFIX)/bin # # system programs (netplan) --HELP=/usr/local/lib -+HELP=$(DOCBASE) +-HELP=/usr/freeware/lib ++SBIN=${PREFIX}/bin # # netplan expects netplan.dir/ here --NETPLANDIR=/usr/local/lib +-NETPLANDIR=/usr/freeware/lib +NETPLANDIR=$(LIB) # # unformatted nroff manpage (plan.[14]) --MAN=/usr/local/man +-MAN=/usr/share/man/local/man +MAN=$(PREFIX)/man/man # # formatted manpage (plan.[14]) - CATMAN=/usr/catman/local/cat + CATMAN=/usr/share/catman/local/cat # # subdirectory in home dir, or empty -@@ -34,9 +42,9 @@ +@@ -34,9 +40,9 @@ # # standard Unix compiler generator YACC=yacc # # numerical user ID of <nobody> account @@ -45,7 +43,7 @@ # # used by plan to pre-process holiday files, # # plan will check if this file really exists CPP_PATH='/lib/cpp -P -I$(HELP)' -@@ -49,12 +57,17 @@ +@@ -49,12 +55,17 @@ # # uncomment this for Japanese version of plan # # JAPAN requires X11R5 and a Japanese env. JAPANDEFS='-DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 -DLOCALE_SJIS=ja_JP.SJIS -DLOCALE_EUC=ja_JP.EUC' @@ -59,12 +57,12 @@ HOLIDAY=german # # do NOT define -O2 on DEC OSF/1 machines! # # use -O instead of -O2 on HP to avoid warning --DEBUG=-O +-DEBUG=-O2 -n32 +DEBUG=${CFLAGS} # # what to do without make arguments - DEFTARGET=help + DEFTARGET=sgi #------------------------- end of configuration section ---------------------- -@@ -224,10 +237,10 @@ +@@ -218,10 +229,10 @@ BSDIG_L2= -L/usr/X11/lib -lc NBSD_L1 = -L/usr/X11R6/lib -lXm -lXt -lX11 NBSD_L2 = -L/usr/X11R6/lib -lc @@ -79,7 +77,7 @@ LINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM -lXm -lXt -lX11 -lXpm -lc -lXext -lSM -lICE -lX11 LINUX_L2= -lc SLINUX_L1= -L/usr/X11R6/lib -L/usr/lib/X11R6/lib -lSM /usr/X11R6/lib/libXm.a -lXt -lX11 /usr/X11R6/lib/libXpm.a -lc -lXext -lSM -lICE -lX11 -@@ -294,7 +307,7 @@ +@@ -286,7 +297,7 @@ @echo " make bsdi BSDI/386" @echo " make bsdig BSDI/386 with gcc" @echo " make netbsd NetBSD/i386 1.0A (maybe others too)" @@ -88,7 +86,7 @@ @echo " make openbsd OpenBSD" @echo " make svr4 SVR4 Using gcc" @echo " make news4 Sony NEWS-OS4.x" -@@ -538,7 +551,7 @@ +@@ -524,7 +535,7 @@ $(CCLINE) -c -DLIB=\"$(LIB)\" $< holiday.o: holiday.c $(MAKEFILE) |