diff options
Diffstat (limited to 'shells/bash1/files/patch-ab')
| -rw-r--r-- | shells/bash1/files/patch-ab | 69 |
1 files changed, 53 insertions, 16 deletions
diff --git a/shells/bash1/files/patch-ab b/shells/bash1/files/patch-ab index 46c5e4f858c3..908154888e5c 100644 --- a/shells/bash1/files/patch-ab +++ b/shells/bash1/files/patch-ab @@ -1,19 +1,56 @@ -*** Makefile.in.bak Wed Dec 18 22:57:21 1996 ---- Makefile.in Fri Dec 27 14:20:11 1996 +*** cpp-Makefile.orig Sun Jun 11 22:44:05 1995 +--- cpp-Makefile Wed Jul 19 20:17:18 1995 *************** -*** 499,505 **** +*** 133,139 **** +--- 133,143 ---- + /usr/include. Then it will break.) */ + CC = gcc -traditional -I/usr/include $(GCC_EXTRAS) + # else /* HAVE_FIXED_INCLUDES */ ++ #ifdef __FreeBSD__ ++ CC += $(GCC_EXTRAS) ++ #else + CC = gcc $(GCC_EXTRAS) ++ #endif + # endif /* HAVE_FIXED_INCLUDES */ + #else /* !HAVE_GCC */ + CC = CPP_CC +*************** +*** 151,158 **** +--- 155,167 ---- + AR = ar + + INSTALL = $(SUPPORT_SRC)install.sh ++ #ifndef __FreeBSD__ + INSTALL_PROGRAM = $(INSTALL) -c + INSTALL_DATA = $(INSTALL) -c -m 644 ++ #else ++ INSTALL_PROGRAM = install -c -o bin -g bin -m 555 ++ INSTALL_DATA = install -c -o bin -g bin -m 644 ++ #endif - install: .made installdirs - $(INSTALL_PROGRAM) $(Program) $(bindir)/$(Program) -! $(INSTALL_PROGRAM) bashbug $(bindir)/bashbug - -( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \ - man1dir=$(man1dir) man1ext=$(man1ext) \ - man3dir=$(man3dir) man3ext=$(man3ext) \ ---- 499,505 ---- + COMPRESS = gzip + COMPRESS_EXT = .gz +*************** +*** 300,306 **** +--- 309,317 ---- + /**/# The GNU coding standards don't recognize the possibility that + /**/# other information besides optimization and debugging might be + /**/# passed to cc. A different name should have been used. ++ #ifndef __FreeBSD__ + CFLAGS = -O -g ++ #endif - install: .made installdirs - $(INSTALL_PROGRAM) $(Program) $(bindir)/$(Program) -! $(INSTALL) -m 555 bashbug $(bindir)/bashbug - -( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \ - man1dir=$(man1dir) man1ext=$(man1ext) \ - man3dir=$(man3dir) man3ext=$(man3ext) \ + SYSTEM_FLAGS = $(LINEBUF) $(VPRINTF) $(UNISTD) $(STDLIB) $(LIMITSH) \ + $(GROUPS) $(RESOURCE) $(PARAM) $(SIGHANDLER) $(SYSDEP) $(WAITH) \ +*************** +*** 308,313 **** +--- 319,327 ---- + $(VARARGSH) $(STRCHR) $(STRCASE) $(DEVFD) \ + -D$(Machine) -D$(OS) + LDFLAGS = $(NOSHARE) $(SYSDEP_LD) $(EXTRA_LD_PATH) $(PROFILE_FLAGS) $(CFLAGS) ++ #ifdef __FreeBSD__ ++ LDFLAGS += -s ++ #endif + CCFLAGS = $(PROFILE_FLAGS) $(SYSTEM_FLAGS) -DSHELL $(ALLOCA_CFLAGS) \ + $(MALLOC_CFLAGS) $(CFLAGS) + CPPFLAGS= -I. -I$(srcdir) -I$(LIBSRC) |