[patch] makefile

plan-1.12-makefile.patch (text/plain), 7.92 KB, created by Thomas Groman on 2021-03-19 07:41:32 UTC

From fd19b07f6565631c47944f63dde3783a649b541f Mon Sep 17 00:00:00 2001
From: Thomas Groman <[e-mail]>
Date: Fri, 19 Mar 2021 00:31:37 -0700
Subject: [PATCH] makefile

---
 src/Makefile | 76 +++++++++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 74690b7..4e79c86 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,19 +8,19 @@
 # after "=", this is parsed and rewritten by the configure script.
 #
 #				# user-callable executable (plan)
-DIR=/usr/local/bin
+DIR=/usr/bin
 #				# auxiliary programs (pland, notifier, PS)
-LIB=/usr/local/lib
+LIB=/usr/lib
 #				# help file (plan.help)
-SBIN=/usr/local/bin
+SBIN=/usr/bin
 #				# system programs (netplan)
-HELP=/usr/local/lib
+HELP=/usr/share/plan
 #				# netplan expects netplan.dir/ here
-NETPLANDIR=/usr/local/lib
+NETPLANDIR=/usr/share/plan
 #				# unformatted nroff manpage (plan.[14])
-MAN=/usr/local/man/man
+MAN=/usr/man/man
 #				# formatted manpage (plan.[14])
-CATMAN=/usr/catman/local/cat
+CATMAN=/usr/share/catman/local/cat
 #				# subdirectory in home dir, or empty
 PLANRULE=
 #				# lockfile for plan, %d is uid
@@ -32,11 +32,11 @@ INCDIR=
 #				# standard Unix lexer
 LEX=lex
 #				# standard Unix compiler generator
-YACC=yacc
+YACC=bison -y
 #				# numerical user ID of <nobody> account
-NOB_UID=60001
+NOB_UID=65534
 #				# default numerical group ID of <nobody>
-NOB_GID=60001
+NOB_GID=665534
 # 				# used by plan to pre-process holiday files,
 #				# plan will check if this file really exists
 CPP_PATH='/lib/cpp -P -I$(HELP)'
@@ -51,11 +51,10 @@ ESCTOJISLATIN=\"\\033\(J\"
 JAPANDEFS='-DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 -DLOCALE_SJIS=ja_JP.SJIS -DLOCALE_EUC=ja_JP.EUC'
 JAPAN=
 #				# default holiday locale
-HOLIDAY=german
+HOLIDAY=us
 #				# do NOT define -O2 on DEC OSF/1 machines!
 #				# use -O instead of -O2 on HP and Solaris
-DEBUG=-g
-DEBUG=-O2
+DEBUG=$(CFLAGS)
 #				# what to do without make arguments
 DEFTARGET=linux
 #------------------------- end of configuration section ----------------------
@@ -143,9 +142,9 @@ FBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\
 	  -DSTDLIBMALLOC
 OBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
 	  -DNO_MOTIF -DSTDLIBMALLOC
-LINUX_C	= -W -Wall -m32 -I/usr/X11R6/include -I/usr/include/X11 \
+LINUX_C	= -I/usr/X11R6/include -I/usr/include/X11 \
 	  -DNOLOCK -DLINUX -Dlinux
-LINUX64_C = -W -Wall -m64 -I/usr/X11R6/include -I/usr/include/X11 \
+LINUX64_C = -I/usr/X11R6/include -I/usr/include/X11 \
 	  -DNOLOCK -DLINUX -Dlinux
 DEBIAN_C = -W -Wall -Wcast-align -Wmissing-declarations -Wmissing-prototypes \
 	  -Wstrict-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -m32 \
@@ -428,18 +427,18 @@ svr4:
 	env CF="$(SVR4_C)" L1F="$(SVR4_L1)" L2F="$(SVR4_L2)" MYCC=gcc make all
 
 linux:
-	-env CF="$(LINUX_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=gcc make all
+	-env CF="$(LINUX_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=${CC} $(MAKE) all
 	@echo --------------------
 	@echo 'NOTE: if compilation failed with "cannot find -lXt", try "make clean; make linux64"'
 
 linux64:
-	env CF="$(LINUX64_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=gcc make all
+	env CF="$(LINUX64_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=${CC} $(MAKE) all
 
 debian:
 	env CF="$(DEBIAN_C)" L1F="$(DEBIAN_L1)" L2F="$(DEBIAN_L2)" MYCC=gcc make all
 
 slinux:
-	env CF="$(LINUX_C)" L1F="$(SLINUX_L1)" L2F="$(SLINUX_L2)" MYCC=gcc make all
+	env CF="$(LINUX_C)" L1F="$(SLINUX_L1)" L2F="$(SLINUX_L2)" MYCC=${CC} $(MAKE) all
 
 news4:
 	make CF="$(NEWS_C)" L1F="$(NEWS_L1)" L2F="$(NEWS_L2)" MYCC=cc all
@@ -521,41 +520,41 @@ S_SRC	= netplan.c netplan_acl.c
 S_OBJ	= netplan.o netplan_acl.o
 S_INC	= netplan.h netplan_if.h
 
-CCLINE	= $(MYCC) $(OPT) $(CF) $(JAPAN) $(INCDIR)
+CCLINE	= $(MYCC) $(OPT) $(CPPFLAGS) $(CF) $(JAPAN) $(INCDIR)
 
 #---------------------------------------------------------------
 all:	plan pland notifier netplan
 
 plan:	$(P_OBJ)
-	$(CCLINE) -o plan $(P_OBJ) $(L1F)
+	$(CCLINE) $(LDFLAGS) -o plan $(P_OBJ) $(L1F)
 
 pland:	$(D_OBJ)
-	$(CCLINE) -o pland $(D_OBJ) $(L2F)
+	$(CCLINE) $(LDFLAGS) -o pland $(D_OBJ) $(L2F)
 
 notifier: $(N_OBJ)
-	$(CCLINE) -o notifier $(N_OBJ) $(L1F)
+	$(CCLINE) $(LDFLAGS) -o notifier $(N_OBJ) $(L1F)
 
 netplan: $(S_OBJ) $(MAKEFILE)
-	$(CCLINE) -o netplan $(S_OBJ) \
+	$(CCLINE) $(LDFLAGS) -o netplan $(S_OBJ) \
 		-L/usr/local/lib $(L2F)
 
 .c.o:
 	$(CCLINE) -c $<
 
 print.o: print.c $(MAKEFILE)
-	$(CCLINE) -c -DLIB=\"$(LIB)\" $<
+	$(CCLINE) -c -DLIB=\"$(SHARE)\" $<
 
 network.o: network.c netplan_if.h $(MAKEFILE)
-	$(CCLINE) -c -DLIB=\"$(LIB)\" $<
+	$(CCLINE) -c -DLIB=\"$(SHARE)\" $<
 
 usermenu.o: usermenu.c $(MAKEFILE)
-	$(CCLINE) -c -DLIB=\"$(LIB)\" $<
+	$(CCLINE) -c -DLIB=\"$(SHARE)\" $<
 
 holiday.o: holiday.c $(MAKEFILE)
-	$(CCLINE) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(LIB)\" $<
+	$(CCLINE) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(SHARE)\" $<
 
 util.o: util.c $(MAKEFILE)
-	$(CCLINE) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $<
+	$(CCLINE) -c -DPATH=\"$(DIR):$(SHARE):$(HELP)\" $<
 
 netplan.o: netplan.c netplan_if.h $(MAKEFILE)
 	$(CCLINE) -DNOBODY_UID=$(NOB_UID) -DNOBODY_GID=$(NOB_GID) -c -DLIB=\"$(NETPLANDIR)\" $<
@@ -585,20 +584,22 @@ g_dbase.o g_dbfile.o g_formfile.o g_formop.o: grok.h form.h
 install:
 	-rm -f $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(LIB)/netplan
 	mkdir -p $(DESTDIR)$(DIR)
-	cp plan $(DESTDIR)$(DIR)
-	mkdir -p $(DESTDIR)$(LIB)
-	cp pland notifier ../misc/plan_cal.ps ../language/plan* $(DESTDIR)$(LIB)
-	mkdir -p $(DESTDIR)$(SBIN)
-	cp netplan $(DESTDIR)$(SBIN)
-	-(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(LIB)) || exit 0
+	cp plan pland notifier netplan $(DESTDIR)$(DIR)
+	mkdir -p $(DESTDIR)$(SHARE)
+	cp ../misc/plan_cal.ps ../language/* $(DESTDIR)$(DIR)
+	-(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(SHARE)) || exit 0
+	cp ../language/plan.help $(DESTDIR)$(SHARE)
+	-chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(DIR)/netplan
+	-chmod 644 $(DESTDIR)$(SHARE)/plan.help $(DESTDIR)$(SHARE)/plan_cal.ps $(DESTDIR)$(SHARE)/plan.lang.*
+	-(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(SHARE)/plan_calSJ.ps) || exit 0
 	mkdir -p $(DESTDIR)$(HELP)
 	cp ../language/plan.help $(DESTDIR)$(HELP)
-#	-strip $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(SBIN)/netplan
 	-chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(LIB)/netplan
 	-chmod 644 $(DESTDIR)$(HELP)/plan.help $(DESTDIR)$(LIB)/plan_cal.ps $(DESTDIR)$(LIB)/plan.lang.*
 	-(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(LIB)/plan_calSJ.ps) || exit 0
 	mkdir -p $(DESTDIR)$(NETPLANDIR)/netplan.dir
-	-chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir || exit 0
+	-chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir
+	-chown 65534 $(DESTDIR)$(NETPLANDIR)/netplan.dir
 	-(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0
 	-(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.4 >../misc/plan.4cat) || exit 0
 	-(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/netplan.1 >../misc/netplan.1cat) || exit 0
@@ -608,7 +609,8 @@ install:
 	-(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/plan.1cat $(DESTDIR)$(CATMAN)1/plan.1) || exit 0
 	-(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)4 && cp ../misc/plan.4cat $(DESTDIR)$(CATMAN)4/plan.4) || exit 0
 	-(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/netplan.1cat $(DESTDIR)$(CATMAN)1/netplan.1) || exit 0
-	-(test -f ${HOME}/.holiday || cp ../holiday/holiday_$(HOLIDAY) ${HOME}/.holiday) || exit 0
+	mkdir -p $(DESTDIR)$(SHARE)/holiday
+	cp ../holiday/* $(DESTDIR)$(SHARE)/holiday
 	-(test `uname` = IRIX -o `uname` = IRIX64 && mkdir $$HOME/.icons) || exit 0
 	-(test `uname` = IRIX -o `uname` = IRIX64 && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon) || exit 0
 	@echo ""
-- 
2.26.2