SOURCES: dvdisaster-DESTDIR.patch - updated for 0.66

[charles]

Author: charles                      Date: Mon Jun 19 04:48:46 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.66

---- Files affected:
SOURCES:
   dvdisaster-DESTDIR.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/dvdisaster-DESTDIR.patch
diff -u SOURCES/dvdisaster-DESTDIR.patch:1.2 SOURCES/dvdisaster-DESTDIR.patch:1.3
--- SOURCES/dvdisaster-DESTDIR.patch:1.2	Wed Oct 19 16:59:59 2005
+++ SOURCES/dvdisaster-DESTDIR.patch	Mon Jun 19 06:48:41 2006
@@ -1,49 +1,47 @@
---- dvdisaster-0.64/Makefile.template.orig	2005-09-10 16:17:34.000000000 +0200
-+++ dvdisaster-0.64/Makefile.template	2005-10-19 16:52:33.000000000 +0200
-@@ -126,36 +126,25 @@
- install: dvdisaster
- 	@if ! test -e documentation/de/index.html; then make html; fi 
+--- dvdisaster-0.66/GNUmakefile.template.orig	2006-03-21 20:04:19.000000000 +0100
++++ dvdisaster-0.66/GNUmakefile.template	2006-06-19 04:54:22.593421750 +0200
+@@ -181,26 +181,6 @@
  	@echo "Installing package..."
--	install -d $(BINDIR)
--	install dvdisaster$(EXE_SUFFIX) $(BINDIR)
--	install -d $(DOCSUBDIR)
--	install -m 644 CHANGELOG $(DOCSUBDIR)
--	install -m 644 COPYING $(DOCSUBDIR)
--	install -m 644 CREDITS* $(DOCSUBDIR)
--	install -m 644 TODO $(DOCSUBDIR)
--	install -d $(DOCSUBDIR)/de
--	cd documentation; install -m 644 de/* $(DOCSUBDIR)/de
--	install -d $(DOCSUBDIR)/en
--	cd documentation; install -m 644 en/* $(DOCSUBDIR)/en
--	install -d $(DOCSUBDIR)/images
--	cd documentation; install -m 644 images/* $(DOCSUBDIR)/images
--	install -d $(MANDIR)/man1
--	install -d $(MANDIR)/de/man1
--	install -d $(MANDIR)/it/man1
-+	install -d $(DESTDIR)$(BINDIR)
-+	install dvdisaster$(EXE_SUFFIX) $(DESTDIR)$(BINDIR)
-+	install -d $(DESTDIR)$(MANDIR)/man1
-+	install -d $(DESTDIR)$(MANDIR)/de/man1
-+	install -d $(DESTDIR)$(MANDIR)/it/man1
- 	cd documentation; \
- 	  ESCAPED_DOCSUBDIR=`echo $(DOCSUBDIR) | sed -e 's/\//\\\\\//g'`; \
- 	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR\/en/" <dvdisaster.en.1 >dvdisaster.updated; \
--	  install -m 644 dvdisaster.updated $(MANDIR)/man1/dvdisaster.1; \
-+	  install -m 644 dvdisaster.updated $(DESTDIR)$(MANDIR)/man1/dvdisaster.1; \
- 	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR\/de/" <dvdisaster.de.1 >dvdisaster.updated; \
--	  install -m 644 dvdisaster.updated $(MANDIR)/de/man1/dvdisaster.1; \
-+	  install -m 644 dvdisaster.updated $(DESTDIR)$(MANDIR)/de/man1/dvdisaster.1; \
- 	  sed "s/%docdir%/$$ESCAPED_DOCSUBDIR\/en/" <dvdisaster.it.1 >dvdisaster.updated; \
--	  install -m 644 dvdisaster.updated $(MANDIR)/it/man1/dvdisaster.1; \
-+	  install -m 644 dvdisaster.updated $(DESTDIR)$(MANDIR)/it/man1/dvdisaster.1; \
- 	  rm dvdisaster.updated
- 	if echo $(WITH_OPTIONS) | grep -q "NLS_YES"; then \
- 	  cd locale; \
- 	  for i in ??; do\
--	    install -d $(LOCALEDIR)/$$i/LC_MESSAGES; \
--	    install -m 644 $$i/LC_MESSAGES/dvdisaster.mo $(LOCALEDIR)/$$i/LC_MESSAGES; \
-+	    install -d $(DESTDIR)$(LOCALEDIR)/$$i/LC_MESSAGES; \
-+	    install -m 644 $$i/LC_MESSAGES/dvdisaster.mo $(DESTDIR)$(LOCALEDIR)/$$i/LC_MESSAGES; \
+ 	install -d $(BUILDROOT)$(BINDIR)
+ 	install dvdisaster$(EXE_SUFFIX) $(BUILDROOT)$(BINDIR)
+-	install -d $(BUILDROOT)$(DOCSUBDIR)
+-	install -m 644 CHANGELOG $(BUILDROOT)$(DOCSUBDIR)
+-	install -m 644 COPYING $(BUILDROOT)$(DOCSUBDIR)
+-	install -m 644 CREDITS* $(BUILDROOT)$(DOCSUBDIR)
+-	install -m 644 TODO $(BUILDROOT)$(DOCSUBDIR)
+-	install -d $(BUILDROOT)$(DOCSUBDIR)/cs
+-	cd documentation; install -m 644 cs/*.html $(BUILDROOT)$(DOCSUBDIR)/cs
+-	install -d $(BUILDROOT)$(DOCSUBDIR)/de
+-	cd documentation; install -m 644 de/*.html $(BUILDROOT)$(DOCSUBDIR)/de
+-	install -d $(BUILDROOT)$(DOCSUBDIR)/en
+-	cd documentation; install -m 644 en/*.html $(BUILDROOT)$(DOCSUBDIR)/en
+-	install -d $(BUILDROOT)$(DOCSUBDIR)/images
+-	cd documentation; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/images
+-	cd documentation; install -m 644 images/*.jpg $(BUILDROOT)$(DOCSUBDIR)/images
+-	install -d $(BUILDROOT)$(DOCSUBDIR)/cs/images
+-	cd documentation/cs; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/cs/images
+-	install -d $(BUILDROOT)$(DOCSUBDIR)/de/images
+-	cd documentation/de; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/de/images
+-	install -d $(BUILDROOT)$(DOCSUBDIR)/en/images
+-	cd documentation/en; install -m 644 images/*.png $(BUILDROOT)$(DOCSUBDIR)/en/images
+ 	install -d $(BUILDROOT)$(MANDIR)/man1
+ 	install -d $(BUILDROOT)$(MANDIR)/cs/man1
+ 	install -d $(BUILDROOT)$(MANDIR)/de/man1
+@@ -223,17 +203,6 @@
+ 	    install -m 644 $$i/LC_MESSAGES/dvdisaster.mo $(BUILDROOT)$(LOCALEDIR)/$$i/LC_MESSAGES; \
  	  done \
  	fi
- 
+-	@echo "# dvdisaster uninstaller script" > $(BINDIR)/dvdisaster-uninstall.sh
+-	@echo "# Usage: sh dvdisaster-uninstall.sh" >> $(BINDIR)/dvdisaster-uninstall.sh
+-	@echo >> $(BINDIR)/dvdisaster-uninstall.sh
+-	@echo "rm -f $(BINDIR)/dvdisaster $(BINDIR)/dvdisaster.exe $(BINDIR)/dvdisaster-win.exe $(BINDIR)/dvdisaster-uninstall.sh" >> $(BINDIR)/dvdisaster-uninstall.sh
+-	@echo "rm -rf $(DOCSUBDIR)" >> $(BINDIR)/dvdisaster-uninstall.sh
+-	@echo "rm -f $(MANDIR)/man1/dvdisaster.1" >> $(BINDIR)/dvdisaster-uninstall.sh
+-	@for i in cs de it; do \
+-	  echo "rm $(LOCALEDIR)/$$i/LC_MESSAGES/dvdisaster.mo" >> $(BINDIR)/dvdisaster-uninstall.sh ; \
+-	  echo "rm $(MANDIR)/$$i/man1/dvdisaster.1" >> $(BINDIR)/dvdisaster-uninstall.sh ; \
+-	done
+-	@echo "echo \"dvdisaster has been uninstalled.\"" >> $(BINDIR)/dvdisaster-uninstall.sh
+ 	
+ uninstall:
+ 	@echo "Uninstalling package..."
================================================================

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