Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 739904 | Differences between
and this patch

Collapse All | Expand All

(-)a/src/Makefile (-38 / +39 lines)
Lines 8-26 Link Here
8
# after "=", this is parsed and rewritten by the configure script.
8
# after "=", this is parsed and rewritten by the configure script.
9
#
9
#
10
#				# user-callable executable (plan)
10
#				# user-callable executable (plan)
11
DIR=/usr/local/bin
11
DIR=/usr/bin
12
#				# auxiliary programs (pland, notifier, PS)
12
#				# auxiliary programs (pland, notifier, PS)
13
LIB=/usr/local/lib
13
LIB=/usr/lib
14
#				# help file (plan.help)
14
#				# help file (plan.help)
15
SBIN=/usr/local/bin
15
SBIN=/usr/bin
16
#				# system programs (netplan)
16
#				# system programs (netplan)
17
HELP=/usr/local/lib
17
HELP=/usr/share/plan
18
#				# netplan expects netplan.dir/ here
18
#				# netplan expects netplan.dir/ here
19
NETPLANDIR=/usr/local/lib
19
NETPLANDIR=/usr/share/plan
20
#				# unformatted nroff manpage (plan.[14])
20
#				# unformatted nroff manpage (plan.[14])
21
MAN=/usr/local/man/man
21
MAN=/usr/man/man
22
#				# formatted manpage (plan.[14])
22
#				# formatted manpage (plan.[14])
23
CATMAN=/usr/catman/local/cat
23
CATMAN=/usr/share/catman/local/cat
24
#				# subdirectory in home dir, or empty
24
#				# subdirectory in home dir, or empty
25
PLANRULE=
25
PLANRULE=
26
#				# lockfile for plan, %d is uid
26
#				# lockfile for plan, %d is uid
Lines 32-42 INCDIR= Link Here
32
#				# standard Unix lexer
32
#				# standard Unix lexer
33
LEX=lex
33
LEX=lex
34
#				# standard Unix compiler generator
34
#				# standard Unix compiler generator
35
YACC=yacc
35
YACC=bison -y
36
#				# numerical user ID of <nobody> account
36
#				# numerical user ID of <nobody> account
37
NOB_UID=60001
37
NOB_UID=65534
38
#				# default numerical group ID of <nobody>
38
#				# default numerical group ID of <nobody>
39
NOB_GID=60001
39
NOB_GID=665534
40
# 				# used by plan to pre-process holiday files,
40
# 				# used by plan to pre-process holiday files,
41
#				# plan will check if this file really exists
41
#				# plan will check if this file really exists
42
CPP_PATH='/lib/cpp -P -I$(HELP)'
42
CPP_PATH='/lib/cpp -P -I$(HELP)'
Lines 51-61 ESCTOJISLATIN=\"\\033\(J\" Link Here
51
JAPANDEFS='-DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 -DLOCALE_SJIS=ja_JP.SJIS -DLOCALE_EUC=ja_JP.EUC'
51
JAPANDEFS='-DJAPAN -DESCTOASCII=$(ESCTOJISLATIN) -DLENTOASCII=3 -DLOCALE_SJIS=ja_JP.SJIS -DLOCALE_EUC=ja_JP.EUC'
52
JAPAN=
52
JAPAN=
53
#				# default holiday locale
53
#				# default holiday locale
54
HOLIDAY=german
54
HOLIDAY=us
55
#				# do NOT define -O2 on DEC OSF/1 machines!
55
#				# do NOT define -O2 on DEC OSF/1 machines!
56
#				# use -O instead of -O2 on HP and Solaris
56
#				# use -O instead of -O2 on HP and Solaris
57
DEBUG=-g
57
DEBUG=$(CFLAGS)
58
DEBUG=-O2
59
#				# what to do without make arguments
58
#				# what to do without make arguments
60
DEFTARGET=linux
59
DEFTARGET=linux
61
#------------------------- end of configuration section ----------------------
60
#------------------------- end of configuration section ----------------------
Lines 143-151 FBSD_C = -ansi -I/usr/X11R6/include -DBSD -DNOLOCK -DNOREGEX -DRABBITS\ Link Here
143
	  -DSTDLIBMALLOC
142
	  -DSTDLIBMALLOC
144
OBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
143
OBSD_C	= -ansi -I/usr/X11R6/include -DBSD -DRABBITS -DNOLOCK -DNOREGEX\
145
	  -DNO_MOTIF -DSTDLIBMALLOC
144
	  -DNO_MOTIF -DSTDLIBMALLOC
146
LINUX_C	= -W -Wall -m32 -I/usr/X11R6/include -I/usr/include/X11 \
145
LINUX_C	= -I/usr/X11R6/include -I/usr/include/X11 \
147
	  -DNOLOCK -DLINUX -Dlinux
146
	  -DNOLOCK -DLINUX -Dlinux
148
LINUX64_C = -W -Wall -m64 -I/usr/X11R6/include -I/usr/include/X11 \
147
LINUX64_C = -I/usr/X11R6/include -I/usr/include/X11 \
149
	  -DNOLOCK -DLINUX -Dlinux
148
	  -DNOLOCK -DLINUX -Dlinux
150
DEBIAN_C = -W -Wall -Wcast-align -Wmissing-declarations -Wmissing-prototypes \
149
DEBIAN_C = -W -Wall -Wcast-align -Wmissing-declarations -Wmissing-prototypes \
151
	  -Wstrict-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -m32 \
150
	  -Wstrict-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -m32 \
Lines 428-445 svr4: Link Here
428
	env CF="$(SVR4_C)" L1F="$(SVR4_L1)" L2F="$(SVR4_L2)" MYCC=gcc make all
427
	env CF="$(SVR4_C)" L1F="$(SVR4_L1)" L2F="$(SVR4_L2)" MYCC=gcc make all
429
428
430
linux:
429
linux:
431
	-env CF="$(LINUX_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=gcc make all
430
	-env CF="$(LINUX_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=${CC} $(MAKE) all
432
	@echo --------------------
431
	@echo --------------------
433
	@echo 'NOTE: if compilation failed with "cannot find -lXt", try "make clean; make linux64"'
432
	@echo 'NOTE: if compilation failed with "cannot find -lXt", try "make clean; make linux64"'
434
433
435
linux64:
434
linux64:
436
	env CF="$(LINUX64_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=gcc make all
435
	env CF="$(LINUX64_C)" L1F="$(LINUX_L1)" L2F="$(LINUX_L2)" MYCC=${CC} $(MAKE) all
437
436
438
debian:
437
debian:
439
	env CF="$(DEBIAN_C)" L1F="$(DEBIAN_L1)" L2F="$(DEBIAN_L2)" MYCC=gcc make all
438
	env CF="$(DEBIAN_C)" L1F="$(DEBIAN_L1)" L2F="$(DEBIAN_L2)" MYCC=gcc make all
440
439
441
slinux:
440
slinux:
442
	env CF="$(LINUX_C)" L1F="$(SLINUX_L1)" L2F="$(SLINUX_L2)" MYCC=gcc make all
441
	env CF="$(LINUX_C)" L1F="$(SLINUX_L1)" L2F="$(SLINUX_L2)" MYCC=${CC} $(MAKE) all
443
442
444
news4:
443
news4:
445
	make CF="$(NEWS_C)" L1F="$(NEWS_L1)" L2F="$(NEWS_L2)" MYCC=cc all
444
	make CF="$(NEWS_C)" L1F="$(NEWS_L1)" L2F="$(NEWS_L2)" MYCC=cc all
Lines 521-561 S_SRC = netplan.c netplan_acl.c Link Here
521
S_OBJ	= netplan.o netplan_acl.o
520
S_OBJ	= netplan.o netplan_acl.o
522
S_INC	= netplan.h netplan_if.h
521
S_INC	= netplan.h netplan_if.h
523
522
524
CCLINE	= $(MYCC) $(OPT) $(CF) $(JAPAN) $(INCDIR)
523
CCLINE	= $(MYCC) $(OPT) $(CPPFLAGS) $(CF) $(JAPAN) $(INCDIR)
525
524
526
#---------------------------------------------------------------
525
#---------------------------------------------------------------
527
all:	plan pland notifier netplan
526
all:	plan pland notifier netplan
528
527
529
plan:	$(P_OBJ)
528
plan:	$(P_OBJ)
530
	$(CCLINE) -o plan $(P_OBJ) $(L1F)
529
	$(CCLINE) $(LDFLAGS) -o plan $(P_OBJ) $(L1F)
531
530
532
pland:	$(D_OBJ)
531
pland:	$(D_OBJ)
533
	$(CCLINE) -o pland $(D_OBJ) $(L2F)
532
	$(CCLINE) $(LDFLAGS) -o pland $(D_OBJ) $(L2F)
534
533
535
notifier: $(N_OBJ)
534
notifier: $(N_OBJ)
536
	$(CCLINE) -o notifier $(N_OBJ) $(L1F)
535
	$(CCLINE) $(LDFLAGS) -o notifier $(N_OBJ) $(L1F)
537
536
538
netplan: $(S_OBJ) $(MAKEFILE)
537
netplan: $(S_OBJ) $(MAKEFILE)
539
	$(CCLINE) -o netplan $(S_OBJ) \
538
	$(CCLINE) $(LDFLAGS) -o netplan $(S_OBJ) \
540
		-L/usr/local/lib $(L2F)
539
		-L/usr/local/lib $(L2F)
541
540
542
.c.o:
541
.c.o:
543
	$(CCLINE) -c $<
542
	$(CCLINE) -c $<
544
543
545
print.o: print.c $(MAKEFILE)
544
print.o: print.c $(MAKEFILE)
546
	$(CCLINE) -c -DLIB=\"$(LIB)\" $<
545
	$(CCLINE) -c -DLIB=\"$(SHARE)\" $<
547
546
548
network.o: network.c netplan_if.h $(MAKEFILE)
547
network.o: network.c netplan_if.h $(MAKEFILE)
549
	$(CCLINE) -c -DLIB=\"$(LIB)\" $<
548
	$(CCLINE) -c -DLIB=\"$(SHARE)\" $<
550
549
551
usermenu.o: usermenu.c $(MAKEFILE)
550
usermenu.o: usermenu.c $(MAKEFILE)
552
	$(CCLINE) -c -DLIB=\"$(LIB)\" $<
551
	$(CCLINE) -c -DLIB=\"$(SHARE)\" $<
553
552
554
holiday.o: holiday.c $(MAKEFILE)
553
holiday.o: holiday.c $(MAKEFILE)
555
	$(CCLINE) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(LIB)\" $<
554
	$(CCLINE) -DCPP_PATH=\"$(CPP_PATH)\" -c -DLIB=\"$(SHARE)\" $<
556
555
557
util.o: util.c $(MAKEFILE)
556
util.o: util.c $(MAKEFILE)
558
	$(CCLINE) -c -DPATH=\"$(LIB):$(DIR):$(HELP)\" $<
557
	$(CCLINE) -c -DPATH=\"$(DIR):$(SHARE):$(HELP)\" $<
559
558
560
netplan.o: netplan.c netplan_if.h $(MAKEFILE)
559
netplan.o: netplan.c netplan_if.h $(MAKEFILE)
561
	$(CCLINE) -DNOBODY_UID=$(NOB_UID) -DNOBODY_GID=$(NOB_GID) -c -DLIB=\"$(NETPLANDIR)\" $<
560
	$(CCLINE) -DNOBODY_UID=$(NOB_UID) -DNOBODY_GID=$(NOB_GID) -c -DLIB=\"$(NETPLANDIR)\" $<
Lines 585-604 g_dbase.o g_dbfile.o g_formfile.o g_formop.o: grok.h form.h Link Here
585
install:
584
install:
586
	-rm -f $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(LIB)/netplan
585
	-rm -f $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(LIB)/netplan
587
	mkdir -p $(DESTDIR)$(DIR)
586
	mkdir -p $(DESTDIR)$(DIR)
588
	cp plan $(DESTDIR)$(DIR)
587
	cp plan pland notifier netplan $(DESTDIR)$(DIR)
589
	mkdir -p $(DESTDIR)$(LIB)
588
	mkdir -p $(DESTDIR)$(SHARE)
590
	cp pland notifier ../misc/plan_cal.ps ../language/plan* $(DESTDIR)$(LIB)
589
	cp ../misc/plan_cal.ps ../language/* $(DESTDIR)$(DIR)
591
	mkdir -p $(DESTDIR)$(SBIN)
590
	-(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(SHARE)) || exit 0
592
	cp netplan $(DESTDIR)$(SBIN)
591
	cp ../language/plan.help $(DESTDIR)$(SHARE)
593
	-(test x'$(JAPAN)' != x && cp ../misc/plan_calSJ.ps $(DESTDIR)$(LIB)) || exit 0
592
	-chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(DIR)/pland $(DESTDIR)$(DIR)/notifier $(DESTDIR)$(DIR)/netplan
593
	-chmod 644 $(DESTDIR)$(SHARE)/plan.help $(DESTDIR)$(SHARE)/plan_cal.ps $(DESTDIR)$(SHARE)/plan.lang.*
594
	-(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(SHARE)/plan_calSJ.ps) || exit 0
594
	mkdir -p $(DESTDIR)$(HELP)
595
	mkdir -p $(DESTDIR)$(HELP)
595
	cp ../language/plan.help $(DESTDIR)$(HELP)
596
	cp ../language/plan.help $(DESTDIR)$(HELP)
596
#	-strip $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(SBIN)/netplan
597
	-chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(LIB)/netplan
597
	-chmod 755 $(DESTDIR)$(DIR)/plan $(DESTDIR)$(LIB)/pland $(DESTDIR)$(LIB)/notifier $(DESTDIR)$(LIB)/netplan
598
	-chmod 644 $(DESTDIR)$(HELP)/plan.help $(DESTDIR)$(LIB)/plan_cal.ps $(DESTDIR)$(LIB)/plan.lang.*
598
	-chmod 644 $(DESTDIR)$(HELP)/plan.help $(DESTDIR)$(LIB)/plan_cal.ps $(DESTDIR)$(LIB)/plan.lang.*
599
	-(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(LIB)/plan_calSJ.ps) || exit 0
599
	-(test x'$(JAPAN)' != x && chmod 644 $(DESTDIR)$(LIB)/plan_calSJ.ps) || exit 0
600
	mkdir -p $(DESTDIR)$(NETPLANDIR)/netplan.dir
600
	mkdir -p $(DESTDIR)$(NETPLANDIR)/netplan.dir
601
	-chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir || exit 0
601
	-chmod 700 $(DESTDIR)$(NETPLANDIR)/netplan.dir
602
	-chown 65534 $(DESTDIR)$(NETPLANDIR)/netplan.dir
602
	-(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0
603
	-(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.1 >../misc/plan.1cat) || exit 0
603
	-(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.4 >../misc/plan.4cat) || exit 0
604
	-(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/plan.4 >../misc/plan.4cat) || exit 0
604
	-(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/netplan.1 >../misc/netplan.1cat) || exit 0
605
	-(test x'$(CATMAN)' != xNONE -a -x "`which nroff`" && nroff -man ../misc/netplan.1 >../misc/netplan.1cat) || exit 0
Lines 608-614 install: Link Here
608
	-(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/plan.1cat $(DESTDIR)$(CATMAN)1/plan.1) || exit 0
609
	-(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/plan.1cat $(DESTDIR)$(CATMAN)1/plan.1) || exit 0
609
	-(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)4 && cp ../misc/plan.4cat $(DESTDIR)$(CATMAN)4/plan.4) || exit 0
610
	-(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)4 && cp ../misc/plan.4cat $(DESTDIR)$(CATMAN)4/plan.4) || exit 0
610
	-(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/netplan.1cat $(DESTDIR)$(CATMAN)1/netplan.1) || exit 0
611
	-(test x'$(CATMAN)' != xNONE -a -d $(DESTDIR)$(CATMAN)1 && cp ../misc/netplan.1cat $(DESTDIR)$(CATMAN)1/netplan.1) || exit 0
611
	-(test -f ${HOME}/.holiday || cp ../holiday/holiday_$(HOLIDAY) ${HOME}/.holiday) || exit 0
612
	mkdir -p $(DESTDIR)$(SHARE)/holiday
613
	cp ../holiday/* $(DESTDIR)$(SHARE)/holiday
612
	-(test `uname` = IRIX -o `uname` = IRIX64 && mkdir $$HOME/.icons) || exit 0
614
	-(test `uname` = IRIX -o `uname` = IRIX64 && mkdir $$HOME/.icons) || exit 0
613
	-(test `uname` = IRIX -o `uname` = IRIX64 && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon) || exit 0
615
	-(test `uname` = IRIX -o `uname` = IRIX64 && cp ../misc/Plan.icon $$HOME/.icons/Plan.icon) || exit 0
614
	@echo ""
616
	@echo ""
615
- 

Return to bug 739904