SOURCES: nvclock-DESTDIR.patch - updated for 0.8b

[charles]

Author: charles                      Date: Sat Jan 21 12:18:32 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.8b

---- Files affected:
SOURCES:
   nvclock-DESTDIR.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/nvclock-DESTDIR.patch
diff -u SOURCES/nvclock-DESTDIR.patch:1.1 SOURCES/nvclock-DESTDIR.patch:1.2
--- SOURCES/nvclock-DESTDIR.patch:1.1	Tue Jul 29 21:53:18 2003
+++ SOURCES/nvclock-DESTDIR.patch	Sat Jan 21 13:18:27 2006
@@ -1,36 +1,64 @@
-diff -burN nvclock0.7.orig/src/Makefile.in nvclock0.7/src/Makefile.in
---- nvclock0.7.orig/src/Makefile.in	Sun Jun 22 22:19:18 2003
-+++ nvclock0.7/src/Makefile.in	Tue Jul 29 21:19:50 2003
-@@ -33,7 +33,7 @@
- 
+--- nvclock0.8b/src/Makefile.in.orig	2005-09-02 10:55:12.000000000 +0200
++++ nvclock0.8b/src/Makefile.in	2006-01-21 06:03:28.000000000 +0100
+@@ -45,7 +45,7 @@
  install: install-recursive install-app
  install-app:
+ 	mkdir -p $(bindir)
 -	$(INSTALL) -c nvclock $(bindir)/nvclock
 +	$(INSTALL) -c nvclock $(DESTDIR)$(bindir)/nvclock
  
  
  uninstall: uninstall-recursive uninstall-app
-diff -burN nvclock0.7.orig/src/gtk/Makefile.in nvclock0.7/src/gtk/Makefile.in
---- nvclock0.7.orig/src/gtk/Makefile.in	Sun Jun 22 22:17:31 2003
-+++ nvclock0.7/src/gtk/Makefile.in	Tue Jul 29 21:20:27 2003
+--- nvclock0.8b/src/gtk/Makefile.in.orig	2005-09-02 10:32:49.000000000 +0200
++++ nvclock0.8b/src/gtk/Makefile.in	2006-01-21 06:06:03.000000000 +0100
 @@ -13,7 +13,7 @@
  
  ifeq ($(HAVE_GTK2), yes)
      PROGRAM=nvclock_gtk
--    INSTALL_APP=$(INSTALL) -c $(PROGRAM) $(bindir)/$(PROGRAM)
-+    INSTALL_APP=$(INSTALL) -c $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
+-    INSTALL_APP=mkdir -p $(bindir); $(INSTALL) -c $(PROGRAM) $(bindir)/$(PROGRAM)
++    INSTALL_APP=mkdir -p $(DESTDIR)$(bindir); $(INSTALL) -c $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
      UNINSTALL_APP=rm -f $(bindir)/$(PROGRAM)
  endif
  
-diff -burN nvclock0.7.orig/src/qt/Makefile.in nvclock0.7/src/qt/Makefile.in
---- nvclock0.7.orig/src/qt/Makefile.in	Sun Jun 22 22:27:30 2003
-+++ nvclock0.7/src/qt/Makefile.in	Tue Jul 29 21:20:18 2003
+--- nvclock0.8b/src/qt/Makefile.in.orig	2005-09-02 10:33:01.000000000 +0200
++++ nvclock0.8b/src/qt/Makefile.in	2006-01-21 06:07:24.000000000 +0100
 @@ -14,7 +14,7 @@
  
  ifeq ($(HAVE_QT), yes)
      PROGRAM=nvclock_qt
--    INSTALL_APP=$(INSTALL) -c $(PROGRAM) $(bindir)/$(PROGRAM)
-+    INSTALL_APP=$(INSTALL) -c $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
+-    INSTALL_APP=mkdir -p $(bindir); $(INSTALL) -c $(PROGRAM) $(bindir)/$(PROGRAM)
++    INSTALL_APP=mkdir -p $(DESTDIR)$(bindir); $(INSTALL) -c $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
      UNINSTALL_APP=rm -f $(bindir)/$(PROGRAM)
  endif
  
+--- nvclock0.8b/Makefile.in.old	2005-05-28 16:07:10.000000000 +0200
++++ nvclock0.8b/Makefile.in	2006-01-21 13:03:11.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ prefix=@prefix@
+ docdir=${prefix}/share/doc/nvclock
+-mandir=${prefix}/man
++mandir=${prefix}/share/man
+ DOCS= ABOUT AUTHORS ChangeLog FAQ README
+ 
+ all:
+@@ -15,7 +15,7 @@
+ 	$(MAKE) -C src distclean
+ 	rm -f *.h config.log config.cache config.status Makefile stamp-h
+ 
+-install: install-docs install-man
++install: install-man
+ 	$(MAKE) -C src install
+ 
+ install-docs:
+@@ -30,8 +30,8 @@
+ 	done
+ 
+ install-man:
+-	mkdir -p $(mandir)/man1
+-	cp nvclock.1 $(mandir)/man1
++	mkdir -p $(DESTDIR)$(mandir)/man1
++	cp nvclock.1 $(DESTDIR)$(mandir)/man1
+ 
+ uninstall: uninstall-docs uninstall-man
+ 	$(MAKE) -C src uninstall
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/nvclock-DESTDIR.patch?r1=1.1&r2=1.2&f=u