aboutsummaryrefslogtreecommitdiff
path: root/package/screen
diff options
context:
space:
mode:
authorGravatar Nigel Kukard <nkukard@lbsd.net>2009-01-03 16:30:09 +0000
committerGravatar Nigel Kukard <nkukard@lbsd.net>2009-01-03 16:30:09 +0000
commit3ed07ff64b0941ffb15c75c8948143068cbf5022 (patch)
tree7bccc1b678a9232fe7cbd3efdca6a2aeb3f1e553 /package/screen
parent2d696140c2a2b197dcd9eecb3f53b97dd812783b (diff)
downloadbuildroot-3ed07ff64b0941ffb15c75c8948143068cbf5022.tar.gz
buildroot-3ed07ff64b0941ffb15c75c8948143068cbf5022.tar.bz2
* Simplify the screen install, no versioned binaries, no symlink to versioned binary
Diffstat (limited to 'package/screen')
-rw-r--r--package/screen/screen-4.0.2_install-fix.patch26
1 files changed, 15 insertions, 11 deletions
diff --git a/package/screen/screen-4.0.2_install-fix.patch b/package/screen/screen-4.0.2_install-fix.patch
index e56458f2bf..a2fa35d348 100644
--- a/package/screen/screen-4.0.2_install-fix.patch
+++ b/package/screen/screen-4.0.2_install-fix.patch
@@ -1,16 +1,20 @@
-diff -ru screen-4.0.2_vanilla/Makefile.in screen-4.0.2_install-fix/Makefile.in
+diff -ru screen-4.0.2_vanilla/Makefile.in screen-4.0.2_install-fixup/Makefile.in
--- screen-4.0.2_vanilla/Makefile.in 2003-12-05 13:59:39.000000000 +0000
-+++ screen-4.0.2_install-fix/Makefile.in 2008-05-01 10:47:49.000000000 +0000
-@@ -74,11 +74,12 @@
- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
- then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
- $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
++++ screen-4.0.2_install-fixup/Makefile.in 2009-01-03 15:20:22.000000000 +0000
+@@ -71,14 +71,9 @@
+ $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
+
+ install_bin: .version screen
+- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
+- then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
+- $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
- -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
-+ -chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
- # This doesn't work if $(bindir)/screen is a symlink
- -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
- rm -f $(DESTDIR)$(bindir)/screen
- (cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen)
+-# This doesn't work if $(bindir)/screen is a symlink
+- -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi
+- rm -f $(DESTDIR)$(bindir)/screen
+- (cd $(DESTDIR)$(bindir) && ln -sf $(SCREEN) screen)
++ $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/screen
++ -chmod 4755 $(DESTDIR)$(bindir)/screen
+ mkdir -p $(DESTDIR)$(SCREENENCODINGS)
cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)