- updated for 1.1.5

Changed files:
    cdrdao-destdir.patch -> 1.2

diff --git a/cdrdao-destdir.patch b/cdrdao-destdir.patch
index 59bece4fb53c9fb4d2058e2e936715f23dfd11b4..e1d451b283c10aa7e120b6c0f698074dea0e0c4a 100644 (file)
--- a/cdrdao-destdir.patch
+++ b/cdrdao-destdir.patch
@@ -1,40 +1,66 @@
-diff -urN cdrdao-1.1.3.orig/dao/Makefile.in cdrdao-1.1.3/dao/Makefile.in
---- cdrdao-1.1.3.orig/dao/Makefile.in  Tue Oct 26 18:13:45 1999
-+++ cdrdao-1.1.3/dao/Makefile.in       Mon Apr 24 18:31:41 2000
-@@ -61,12 +61,12 @@
+diff -Nur cdrdao-1.1.5.orig/dao/Makefile.in cdrdao-1.1.5/dao/Makefile.in
+--- cdrdao-1.1.5.orig/dao/Makefile.in  Sun Apr 29 15:42:08 2001
++++ cdrdao-1.1.5/dao/Makefile.in       Fri Nov  2 12:59:50 2001
+@@ -67,14 +67,14 @@
  all: $(PRG)
  
  install: all installdirs
 -      $(INSTALL_PROGRAM) $(PRG) $(bindir)
 -      $(INSTALL_DATA) cdrdao.man $(man1dir)/cdrdao.1
+-      $(INSTALL_DATA) cdrdao.drivers $(DRIVER_TABLE_FILE)
 +      $(INSTALL_PROGRAM) $(PRG) $(DESTDIR)$(bindir)
 +      $(INSTALL_DATA) cdrdao.man $(DESTDIR)$(man1dir)/cdrdao.1
++      $(INSTALL_DATA) cdrdao.drivers $(DESTDIR)$(DRIVER_TABLE_FILE)
  
  installdirs:
 -      $(srcdir)/../mkinstalldirs $(bindir)
 -      $(srcdir)/../mkinstalldirs $(man1dir)
+-      $(srcdir)/../mkinstalldirs $(CDRDAO_DATA_DIR)
 +      $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
 +      $(srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir)
++      $(srcdir)/../mkinstalldirs $(DESTDIR)$(CDRDAO_DATA_DIR)
  
  clean:
        rm -f *.o $(PRG)
-diff -urN cdrdao-1.1.3.orig/xdao/Makefile.in cdrdao-1.1.3/xdao/Makefile.in
---- cdrdao-1.1.3.orig/xdao/Makefile.in Tue Oct 26 18:13:46 1999
-+++ cdrdao-1.1.3/xdao/Makefile.in      Mon Apr 24 18:00:57 2000
-@@ -59,12 +59,12 @@
+diff -Nur cdrdao-1.1.5.orig/xdao/Makefile.in cdrdao-1.1.5/xdao/Makefile.in
+--- cdrdao-1.1.5.orig/xdao/Makefile.in Sun Apr 29 15:42:09 2001
++++ cdrdao-1.1.5/xdao/Makefile.in      Fri Nov  2 13:00:36 2001
+@@ -70,23 +70,23 @@
  all: $(PRG)
  
  install: all installdirs
 -      $(INSTALL_PROGRAM) $(PRG) $(bindir)
 -      $(INSTALL_DATA) xcdrdao.man $(man1dir)/xcdrdao.1
+-      $(INSTALL_DATA) gcdmaster.png $(PIXMAPS_DIR)/gcdmaster.png
+-      $(INSTALL_DATA) pixmap_audiocd.png $(PIXMAPS_DIR)/pixmap_audiocd.png
+-      $(INSTALL_DATA) pixmap_copycd.png $(PIXMAPS_DIR)/pixmap_copycd.png
+-      $(INSTALL_DATA) pixmap_datacd.png $(PIXMAPS_DIR)/pixmap_datacd.png
+-      $(INSTALL_DATA) pixmap_dumpcd.png $(PIXMAPS_DIR)/pixmap_dumpcd.png
+-      $(INSTALL_DATA) pixmap_help.png $(PIXMAPS_DIR)/pixmap_help.png
+-      $(INSTALL_DATA) pixmap_mixedcd.png $(PIXMAPS_DIR)/pixmap_mixedcd.png
+-      $(INSTALL_DATA) pixmap_open.png $(PIXMAPS_DIR)/pixmap_open.png
+-      $(INSTALL_DATA) gcdmaster.desktop $(datadir)/gnome/apps/Applications/gcdmaster.desktop
 +      $(INSTALL_PROGRAM) $(PRG) $(DESTDIR)$(bindir)
 +      $(INSTALL_DATA) xcdrdao.man $(DESTDIR)$(man1dir)/xcdrdao.1
++      $(INSTALL_DATA) gcdmaster.png $(DESTDIR)$(PIXMAPS_DIR)/gcdmaster.png
++      $(INSTALL_DATA) pixmap_audiocd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_audiocd.png
++      $(INSTALL_DATA) pixmap_copycd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_copycd.png
++      $(INSTALL_DATA) pixmap_datacd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_datacd.png
++      $(INSTALL_DATA) pixmap_dumpcd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_dumpcd.png
++      $(INSTALL_DATA) pixmap_help.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_help.png
++      $(INSTALL_DATA) pixmap_mixedcd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_mixedcd.png
++      $(INSTALL_DATA) pixmap_open.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_open.png
++      $(INSTALL_DATA) gcdmaster.desktop $(DESTDIR)$(datadir)/gnome/apps/Applications/gcdmaster.desktop
  
  installdirs:
 -      $(srcdir)/../mkinstalldirs $(bindir)
 -      $(srcdir)/../mkinstalldirs $(man1dir)
+-      $(srcdir)/../mkinstalldirs $(PIXMAPS_DIR)
+-      $(srcdir)/../mkinstalldirs $(datadir)/gnome/apps/Applications
 +      $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
 +      $(srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir)
++      $(srcdir)/../mkinstalldirs $(DESTDIR)$(PIXMAPS_DIR)
++      $(srcdir)/../mkinstalldirs $(DESTDIR)$(datadir)/gnome/apps/Applications
  
- clean:
-       rm -f *.o $(PRG)
+ uninstall:
+       rm -f $(bindir)/$(PRG) $(man1dir)/xcdrdao.1