1
0

patch-Makefile 2.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586
  1. --- mgetty-1.1.36.orig/Makefile 2007-06-15 13:15:56.000000000 +0200
  2. +++ mgetty-1.1.36/Makefile 2011-02-28 21:22:07.000000000 +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. @@ -143,7 +143,7 @@ CFLAGS=-O2 -Wall -pipe
  22. # "utmp.o: unresolved symbol _login"
  23. # For Linux, add "-lutil" if the linker complains about "updwtmp".
  24. #
  25. -LDFLAGS=
  26. +LDFLAGS?=
  27. LIBS=
  28. #LIBS=-lprot -lsocket # SCO Unix
  29. #LIBS=-lsocket
  30. @@ -164,7 +164,9 @@ LIBS=
  31. #
  32. # if your systems doesn't have one, use the shell script that I provide
  33. # in "inst.sh" (taken from X11R5). Needed on IRIX5.2
  34. -INSTALL=install -c -o bin -g bin
  35. +STRIP=
  36. +INSTALL=install -c -o root -g root
  37. +#INSTALL=install -c -o bin -g bin
  38. #INSTALL=install -c -o root -g wheel # NeXT/BSD
  39. #INSTALL=/usr/ucb/install -c -o bin -g bin # AIX, Solaris 2.x
  40. #INSTALL=installbsd -c -o bin -g bin # OSF/1, AIX 4.1, 4.2
  41. @@ -216,7 +218,7 @@ FAX_SPOOL_OUT=$(FAX_SPOOL)/outgoing
  42. # (it's possible to run faxrunq(d) as root, but the FAX_OUT_USER
  43. # MUST NOT BE root or any other privileged account).
  44. #
  45. -FAX_OUT_USER=fax
  46. +FAX_OUT_USER=root
  47. #
  48. #
  49. # Where section 1 manual pages should be placed
  50. @@ -421,7 +423,12 @@ sedscript: mksed
  51. ./mksed >sedscript
  52. chmod +x sedscript
  53. -mksed: mksed.c policy.h Makefile
  54. +REALGCC:=/usr/bin/gcc
  55. +mksed: mksed.c policy.h Makefile
  56. + ( echo $(CC_FOR_BUILD); $(MAKE) "CC=$(CC_FOR_BUILD)" "CFLAGS=$(CFLAGS_FOR_BUILD)" mksed-wrong;\
  57. + );
  58. +
  59. +mksed-wrong: mksed.c policy.h Makefile
  60. $(CC) $(CFLAGS) -DBINDIR=\"$(BINDIR)\" -DSBINDIR=\"$(SBINDIR)\" \
  61. -DLIBDIR=\"$(LIBDIR)\" \
  62. -DCONFDIR=\"$(CONFDIR)\" \
  63. @@ -586,8 +593,10 @@ install.bin: mgetty sendfax newslock \
  64. -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
  65. -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
  66. -mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old
  67. - $(INSTALL) -s -m 700 mgetty $(SBINDIR)
  68. - $(INSTALL) -s -m 755 sendfax $(SBINDIR)
  69. + $(INSTALL) -m 700 mgetty $(SBINDIR)
  70. + $(STRIP) $(SBINDIR)/mgetty
  71. + $(INSTALL) -m 755 sendfax $(SBINDIR)
  72. + $(STRIP) $(SBINDIR)/sendfax
  73. #
  74. # data files + directories
  75. #
  76. @@ -649,7 +658,8 @@ install.bin: mgetty sendfax newslock \
  77. if [ ! -z "$(INSTALL_MECHO)" ] ; then \
  78. cd compat ; \
  79. $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
  80. - $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \
  81. + $(INSTALL) -m 755 mg.echo $(BINDIR) && \
  82. + $(STRIP) $(BINDIR)/mg.echo ; \
  83. fi
  84. #