SOURCES: celestia-makefile.patch - dont remove this code, its necc...

[havner]

Author: havner                       Date: Thu Jun 29 22:56:14 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- dont remove this code, its neccesary (although it should be done in more
  pretty way), just add DESTDIR

---- Files affected:
SOURCES:
   celestia-makefile.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/celestia-makefile.patch
diff -u SOURCES/celestia-makefile.patch:1.2 SOURCES/celestia-makefile.patch:1.3
--- SOURCES/celestia-makefile.patch:1.2	Sun Dec 25 01:36:44 2005
+++ SOURCES/celestia-makefile.patch	Fri Jun 30 00:56:09 2006
@@ -1,15 +1,20 @@
-diff -ruN celestia-1.4.0./Makefile.am celestia-1.4.0/Makefile.am
---- celestia-1.4.0./Makefile.am	2005-12-25 00:36:47.000000000 +0100
-+++ celestia-1.4.0/Makefile.am	2005-12-25 00:38:04.094027272 +0100
-@@ -31,11 +31,3 @@
- 	cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
+diff -urN celestia-1.4.1.orig/Makefile.am celestia-1.4.1/Makefile.am
+--- celestia-1.4.1.orig/Makefile.am	2006-02-03 19:04:33.000000000 +0100
++++ celestia-1.4.1/Makefile.am	2006-06-30 00:27:56.358471750 +0200
+@@ -66,11 +66,11 @@
+ 	)
  
  install-data-hook:
 -	if [ "$(kde_datadir)" -a -d $(kde_datadir)/@PACKAGE@ -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \
 -		mv -f -b $(kde_datadir)/@PACKAGE@/* $(datadir)/@PACKAGE@/ ; \
 -		rmdir $(kde_datadir)/@PACKAGE@ ; \
--	fi
++	if [ "$(DESTDIR)$(kde_datadir)" -a -d $(DESTDIR)$(kde_datadir)/@PACKAGE@ -a ! -h $(DESTDIR)$(kde_datadir)/@PACKAGE@ ] ; then \
++		mv -f -b $(DESTDIR)$(kde_datadir)/@PACKAGE@/* $(DESTDIR)$(datadir)/@PACKAGE@/ ; \
++		rmdir $(DESTDIR)$(kde_datadir)/@PACKAGE@ ; \
+ 	fi
 -	if [ "$(kde_datadir)" -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \
 -		ln -s $(datadir)/@PACKAGE@ $(kde_datadir)/@PACKAGE@ ; \
--	fi
--
++	if [ "$(DESTDIR)$(kde_datadir)" -a ! -h $(DESTDIR)$(kde_datadir)/@PACKAGE@ ] ; then \
++		ln -s $(datadir)/@PACKAGE@ $(DESTDIR)$(kde_datadir)/@PACKAGE@ ; \
+ 	fi
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/celestia-makefile.patch?r1=1.2&r2=1.3&f=u