[packages/screen.git] / screen-DESTDIR.patch

diff -Nru screen-3.9.5/Makefile.in screen-3.9.5.new/Makefile.in
--- screen-3.9.5/Makefile.in	Fri Jun 23 00:25:37 2000
+++ screen-3.9.5.new/Makefile.in	Fri Jun 23 00:24:23 2000
@@ -71,14 +71,8 @@
 	$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
 
 install_bin: .version screen
-	-if [ -f $(bindir)/$(SCREEN) ] && [ ! -f $(bindir)/$(SCREEN).old ]; \
-		then mv $(bindir)/$(SCREEN) $(bindir)/$(SCREEN).old; fi
-	$(INSTALL_PROGRAM) screen $(bindir)/$(SCREEN)
-	-chown root $(bindir)/$(SCREEN) && chmod 4755 $(bindir)/$(SCREEN)
-# This doesn't work if $(bindir)/screen is a symlink
-	-if [ -f $(bindir)/screen ] && [ ! -f $(bindir)/screen.old ]; then mv $(bindir)/screen $(bindir)/screen.old; fi
-	rm -f $(bindir)/screen
-	ln -s $(SCREEN) $(bindir)/screen
+	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
+	-chown root $(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
 
 ###############################################################################
 install: installdirs install_bin
@@ -94,7 +88,7 @@
 
 installdirs:
 # Path leading to ETCSCREENRC and Socketdirectory not checked.
-	$(srcdir)/etc/mkinstalldirs $(bindir)
+	$(srcdir)/etc/mkinstalldirs $(DESTDIR)$(bindir)
 	cd doc ; $(MAKE) installdirs
 
 uninstall: .version
diff -Nru screen-3.9.5/doc/Makefile.in screen-3.9.5.new/doc/Makefile.in
--- screen-3.9.5/doc/Makefile.in	Fri Jun 23 00:25:37 2000
+++ screen-3.9.5.new/doc/Makefile.in	Fri Jun 23 00:24:23 2000
@@ -23,11 +23,11 @@
 	$(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info
 
 install: installdirs
-	$(INSTALL_DATA) $(srcdir)/screen.1 $(mandir)/man1/screen.1
+	$(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1
 	-$(MAKE) screen.info
 	-if test -f screen.info; then d=.; else d=$(srcdir); fi; \
 	if test -f $$d/screen.info; then \
-	for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(infodir);done; \
+	for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(DESTDIR)$(infodir);done; \
 	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
 	  install-info --info-dir=$(infodir) $$d/screen.info; \
 	else true; fi; \
@@ -38,7 +38,7 @@
 	rm -f $(infodir)/screen.info*
 
 installdirs:
-	$(srcdir)/../etc/mkinstalldirs $(mandir)/man1 $(infodir)
+	$(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(infodir)
 
 mostlyclean:
 	-rm -f *.cp *.cps *.fn *.fns *.ky *.kys *.pg *.tp *.vr
Commit	Line	Data
3f2493e3	1	diff -Nru screen-3.9.5/Makefile.in screen-3.9.5.new/Makefile.in
	2	--- screen-3.9.5/Makefile.in Fri Jun 23 00:25:37 2000
	3	+++ screen-3.9.5.new/Makefile.in Fri Jun 23 00:24:23 2000
c58f5c7e	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
3f2493e3	30	diff -Nru screen-3.9.5/doc/Makefile.in screen-3.9.5.new/doc/Makefile.in
	31	--- screen-3.9.5/doc/Makefile.in Fri Jun 23 00:25:37 2000
	32	+++ screen-3.9.5.new/doc/Makefile.in Fri Jun 23 00:24:23 2000
c58f5c7e	33	@@ -23,11 +23,11 @@
	34	$(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info
	35
	36	install: installdirs
	37	- $(INSTALL_DATA) $(srcdir)/screen.1 $(mandir)/man1/screen.1
	38	+ $(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1
	39	-$(MAKE) screen.info
	40	-if test -f screen.info; then d=.; else d=$(srcdir); fi; \
	41	if test -f $$d/screen.info; then \
	42	- for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(infodir);done; \
	43	+ for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(DESTDIR)$(infodir);done; \
	44	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
	45	install-info --info-dir=$(infodir) $$d/screen.info; \
	46	else true; fi; \
	47	@@ -38,7 +38,7 @@
	48	rm -f $(infodir)/screen.info*
	49
	50	installdirs:
	51	- $(srcdir)/../etc/mkinstalldirs $(mandir)/man1 $(infodir)
	52	+ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(infodir)
	53
	54	mostlyclean:
	55	-rm -f .cp .cps .fn .fns .ky .kys .pg .tp *.vr