| c58f5c7e |
1 | diff -Nru screen-3.9.4/Makefile.in screen-3.9.4.new/Makefile.in |
| 2 | --- screen-3.9.4/Makefile.in Wed Aug 11 22:19:51 1999 |
| 3 | +++ screen-3.9.4.new/Makefile.in Sun Dec 5 13:34:41 1999 |
| 4 | @@ -71,14 +71,8 @@ |
| 5 | $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $< |
| 6 | |
| 7 | install_bin: .version screen |
| 8 | - -if [ -f $(bindir)/$(SCREEN) ] && [ ! -f $(bindir)/$(SCREEN).old ]; \ |
| 9 | - then mv $(bindir)/$(SCREEN) $(bindir)/$(SCREEN).old; fi |
| 10 | - $(INSTALL_PROGRAM) screen $(bindir)/$(SCREEN) |
| 11 | - -chown root $(bindir)/$(SCREEN) && chmod 4755 $(bindir)/$(SCREEN) |
| 12 | -# This doesn't work if $(bindir)/screen is a symlink |
| 13 | - -if [ -f $(bindir)/screen ] && [ ! -f $(bindir)/screen.old ]; then mv $(bindir)/screen $(bindir)/screen.old; fi |
| 14 | - rm -f $(bindir)/screen |
| 15 | - ln -s $(SCREEN) $(bindir)/screen |
| 16 | + $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) |
| 17 | + -chown root $(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) |
| 18 | |
| 19 | ############################################################################### |
| 20 | install: installdirs install_bin |
| 21 | @@ -94,7 +88,7 @@ |
| 22 | |
| 23 | installdirs: |
| 24 | # Path leading to ETCSCREENRC and Socketdirectory not checked. |
| 25 | - $(srcdir)/etc/mkinstalldirs $(bindir) |
| 26 | + $(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir) |
| 27 | cd doc ; $(MAKE) installdirs |
| 28 | |
| 29 | uninstall: .version |
| 30 | diff -Nru screen-3.9.4/doc/Makefile.in screen-3.9.4.new/doc/Makefile.in |
| 31 | --- screen-3.9.4/doc/Makefile.in Wed Aug 11 22:19:54 1999 |
| 32 | +++ screen-3.9.4.new/doc/Makefile.in Sun Dec 5 13:32:42 1999 |
| 33 | @@ -4,8 +4,8 @@ |
| 34 | VPATH = @srcdir@ |
| 35 | |
| 36 | prefix = /usr/local |
| 37 | -mandir = $(prefix)/man |
| 38 | -infodir = $(prefix)/info |
| 39 | +mandir = @mandir@ |
| 40 | +infodir = @infodir@ |
| 41 | |
| 42 | INSTALL = @INSTALL@ |
| 43 | INSTALL_DATA = @INSTALL_DATA@ |
| 44 | @@ -23,11 +23,11 @@ |
| 45 | $(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info |
| 46 | |
| 47 | install: installdirs |
| 48 | - $(INSTALL_DATA) $(srcdir)/screen.1 $(mandir)/man1/screen.1 |
| 49 | + $(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1 |
| 50 | -$(MAKE) screen.info |
| 51 | -if test -f screen.info; then d=.; else d=$(srcdir); fi; \ |
| 52 | if test -f $$d/screen.info; then \ |
| 53 | - for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(infodir);done; \ |
| 54 | + for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(DESTDIR)$(infodir);done; \ |
| 55 | if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ |
| 56 | install-info --info-dir=$(infodir) $$d/screen.info; \ |
| 57 | else true; fi; \ |
| 58 | @@ -38,7 +38,7 @@ |
| 59 | rm -f $(infodir)/screen.info* |
| 60 | |
| 61 | installdirs: |
| 62 | - $(srcdir)/../etc/mkinstalldirs $(mandir)/man1 $(infodir) |
| 63 | + $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(infodir) |
| 64 | |
| 65 | mostlyclean: |
| 66 | -rm -f *.cp *.cps *.fn *.fns *.ky *.kys *.pg *.tp *.vr |
projects / packages / screen.git / blame