patch-Makefile 2.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677
  1. --- mgetty-1.1.36.orig/Makefile 2007-06-15 13:15:56.000000000 +0200
  2. +++ mgetty-1.1.36/Makefile 2011-01-21 17:07:06.158658312 +0100
  3. @@ -4,7 +4,7 @@
  4. #
  5. # this is the C compiler to use (on SunOS, the standard "cc" does not
  6. # grok my code, so please use gcc there. On ISC 4.0, use "icc".).
  7. -CC=gcc
  8. +CC?=gcc
  9. #CC=cc
  10. #
  11. #### C Compiler Flags ####
  12. @@ -102,7 +102,7 @@ CC=gcc
  13. # USTAT - ustat(), no statfs etc.
  14. #
  15. #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
  16. -CFLAGS=-O2 -Wall -pipe
  17. +CFLAGS?=-O2 -Wall -pipe
  18. #CFLAGS=-O -DSVR4
  19. #CFLAGS=-O -DSVR4 -DSVR42
  20. #CFLAGS=-O -DUSE_POLL
  21. @@ -164,7 +164,9 @@ LIBS=
  22. #
  23. # if your systems doesn't have one, use the shell script that I provide
  24. # in "inst.sh" (taken from X11R5). Needed on IRIX5.2
  25. -INSTALL=install -c -o bin -g bin
  26. +STRIP=
  27. +INSTALL=install -c -o root -g root
  28. +#INSTALL=install -c -o bin -g bin
  29. #INSTALL=install -c -o root -g wheel # NeXT/BSD
  30. #INSTALL=/usr/ucb/install -c -o bin -g bin # AIX, Solaris 2.x
  31. #INSTALL=installbsd -c -o bin -g bin # OSF/1, AIX 4.1, 4.2
  32. @@ -216,7 +218,7 @@ FAX_SPOOL_OUT=$(FAX_SPOOL)/outgoing
  33. # (it's possible to run faxrunq(d) as root, but the FAX_OUT_USER
  34. # MUST NOT BE root or any other privileged account).
  35. #
  36. -FAX_OUT_USER=fax
  37. +FAX_OUT_USER=root
  38. #
  39. #
  40. # Where section 1 manual pages should be placed
  41. @@ -421,7 +423,12 @@ sedscript: mksed
  42. ./mksed >sedscript
  43. chmod +x sedscript
  44. -mksed: mksed.c policy.h Makefile
  45. +REALGCC:=/usr/bin/gcc
  46. +mksed: mksed.c policy.h Makefile
  47. + ( echo $(CC_FOR_BUILD); $(MAKE) "CC=$(CC_FOR_BUILD)" "CFLAGS=$(CFLAGS_FOR_BUILD)" mksed-wrong;\
  48. + );
  49. +
  50. +mksed-wrong: mksed.c policy.h Makefile
  51. $(CC) $(CFLAGS) -DBINDIR=\"$(BINDIR)\" -DSBINDIR=\"$(SBINDIR)\" \
  52. -DLIBDIR=\"$(LIBDIR)\" \
  53. -DCONFDIR=\"$(CONFDIR)\" \
  54. @@ -586,8 +593,10 @@ install.bin: mgetty sendfax newslock \
  55. -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
  56. -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
  57. -mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old
  58. - $(INSTALL) -s -m 700 mgetty $(SBINDIR)
  59. - $(INSTALL) -s -m 755 sendfax $(SBINDIR)
  60. + $(INSTALL) -m 700 mgetty $(SBINDIR)
  61. + $(STRIP) $(SBINDIR)/mgetty
  62. + $(INSTALL) -m 755 sendfax $(SBINDIR)
  63. + $(STRIP) $(SBINDIR)/sendfax
  64. #
  65. # data files + directories
  66. #
  67. @@ -649,7 +658,8 @@ install.bin: mgetty sendfax newslock \
  68. if [ ! -z "$(INSTALL_MECHO)" ] ; then \
  69. cd compat ; \
  70. $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
  71. - $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \
  72. + $(INSTALL) -m 755 mg.echo $(BINDIR) && \
  73. + $(STRIP) $(BINDIR)/mg.echo ; \
  74. fi
  75. #