--- Makefile.orig 2018-11-30 14:25:04 UTC +++ Makefile @@ -28,7 +28,7 @@ SHELL=/bin/sh c = -DHAVEMEMCMP ## Define DEFFMTCMD to being how to format the media you use the most ## This is the DEFault FoRMat CoManD. -d = -DDEFFMTCMD='"fdformat /dev/fd0H1440"' +d = -DDEFFMTCMD='"/usr/sbin/fdformat -f 1440 /dev/fd0"' ## Define LONGZFILE if you want .Z to be tagged on the end of a 14 char ## file name (or longer for BSD) in the archive when the file is compressed #e = -DLONGZFILE @@ -39,7 +39,7 @@ e2 = -DHAVE_LCHOWN ## Define PRG_COMPRESS to get something other than `gzip'. # you need to edit compfile.c (-G option) if you change this line. -f = -DPRG_COMPRESS='"gzip"' +f = -DPRG_COMPRESS='"/usr/bin/gzip"' ## Define HAVEFNMATCH if you want to use the gnu fnmatch() routine for # -y -Y -w -W matching. @@ -49,6 +49,11 @@ f = -DPRG_COMPRESS='"gzip"' g = -DHAVEFNMATCH +## Define HAVE_PARAM_H if your system has sys/param.h. This is used for BSD +# detection. + +h = -DHAVE_PARAM_H + # fnmatch() is in the gnu C library, so it is directly available on # Linux. If your system (e.g. SCO) does not have the gnu C library, # unpack the archive gnu.fnmatch.tar.gz and uncomment the following @@ -74,13 +79,15 @@ MW=-Wformat -Werror=format-security -Wal #code can be reviewed manually #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations -CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer -Wno-unused-result $(LARGEFILEFLAGS) $(MW) +#CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer -Wno-unused-result $(LARGEFILEFLAGS) $(MW) +CFLAGS1 = -fomit-frame-pointer -CC=gcc +#CC=gcc # also using contents of usin CPPFLAGS, CFLAGS, LDFLAGS out of environment # variables, if they exist -CFLAGS += $(CFLAGS1) $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $(e2) $f $g $I +#CFLAGS += $(CFLAGS1) $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $(e2) $f $g $I +CFLAGS += $(CFLAGS1) $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $I LDFLAGS += CPPFLAGS += @@ -95,8 +102,8 @@ clean: cd regtest; /bin/sh regtest.clean install: afio - cp afio /usr/local/bin - cp afio.1 /usr/share/man/man1 + ${BSD_INSTALL_PROGRAM} afio ${DESTDIR}${PREFIX}/bin + ${BSD_INSTALL_MAN} afio.1 ${DESTDIR}${PREFIX}/man/man1 # generate default list of -E extensions from manpage # note: on sun, I had to change awk command below to nawk or gawk