cdrdao-destdir.patch

   1 --- cdrdao-1.1.7/xdao/Makefile.in.orig  Sun Oct  6 20:53:56 2002
   2 +++ cdrdao-1.1.7/xdao/Makefile.in       Wed Dec 25 20:59:56 2002
   3 @@ -71,32 +71,32 @@
   4  all: $(PRG)
   5
   6  install: all installdirs
   7 -       $(INSTALL_PROGRAM) $(PRG) $(bindir)
   8 -       $(INSTALL_DATA) xcdrdao.man $(man1dir)/xcdrdao.1
   9 -       $(INSTALL_DATA) gcdmaster.png $(PIXMAPS_DIR)/gcdmaster.png
  10 -       $(INSTALL_DATA) pixmap_audiocd.png $(PIXMAPS_DIR)/pixmap_audiocd.png
  11 -       $(INSTALL_DATA) pixmap_copycd.png $(PIXMAPS_DIR)/pixmap_copycd.png
  12 -       $(INSTALL_DATA) pixmap_datacd.png $(PIXMAPS_DIR)/pixmap_datacd.png
  13 -       $(INSTALL_DATA) pixmap_dumpcd.png $(PIXMAPS_DIR)/pixmap_dumpcd.png
  14 -       $(INSTALL_DATA) pixmap_help.png $(PIXMAPS_DIR)/pixmap_help.png
  15 -       $(INSTALL_DATA) pixmap_mixedcd.png $(PIXMAPS_DIR)/pixmap_mixedcd.png
  16 -       $(INSTALL_DATA) pixmap_open.png $(PIXMAPS_DIR)/pixmap_open.png
  17 -       $(INSTALL_DATA) pixmap_play-start.xpm $(PIXMAPS_DIR)/pixmap_play-start.xpm
  18 -       $(INSTALL_DATA) pixmap_play-pause.xpm $(PIXMAPS_DIR)/pixmap_play-pause.xpm
  19 -       $(INSTALL_DATA) pixmap_play-stop.xpm $(PIXMAPS_DIR)/pixmap_play-stop.xpm
  20 -       $(INSTALL_DATA) pixmap_cursor-tool.xpm $(PIXMAPS_DIR)/pixmap_cursor-tool.xpm
  21 -       $(INSTALL_DATA) pixmap_zoom-tool.xpm $(PIXMAPS_DIR)/pixmap_zoom-tool.xpm
  22 -       $(INSTALL_DATA) pixmap_zoom-in.xpm $(PIXMAPS_DIR)/pixmap_zoom-in.xpm
  23 -       $(INSTALL_DATA) pixmap_zoom-out.xpm $(PIXMAPS_DIR)/pixmap_zoom-out.xpm
  24 -       $(INSTALL_DATA) pixmap_zoom-selection.xpm $(PIXMAPS_DIR)/pixmap_zoom-selection.xpm
  25 -       $(INSTALL_DATA) pixmap_zoom-fit.xpm $(PIXMAPS_DIR)/pixmap_zoom-fit.xpm
  26 -       $(INSTALL_DATA) gcdmaster.desktop $(datadir)/gnome/apps/Applications/gcdmaster.desktop
  27 +       $(INSTALL_PROGRAM) $(PRG) $(DESTDIR)$(bindir)
  28 +       $(INSTALL_DATA) xcdrdao.man $(DESTDIR)$(man1dir)/gcdmaster.1x
  29 +       $(INSTALL_DATA) gcdmaster.png $(DESTDIR)$(PIXMAPS_DIR)/gcdmaster.png
  30 +       $(INSTALL_DATA) pixmap_audiocd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_audiocd.png
  31 +       $(INSTALL_DATA) pixmap_copycd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_copycd.png
  32 +       $(INSTALL_DATA) pixmap_datacd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_datacd.png
  33 +       $(INSTALL_DATA) pixmap_dumpcd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_dumpcd.png
  34 +       $(INSTALL_DATA) pixmap_help.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_help.png
  35 +       $(INSTALL_DATA) pixmap_mixedcd.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_mixedcd.png
  36 +       $(INSTALL_DATA) pixmap_open.png $(DESTDIR)$(PIXMAPS_DIR)/pixmap_open.png
  37 +       $(INSTALL_DATA) pixmap_play-start.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_play-start.xpm
  38 +       $(INSTALL_DATA) pixmap_play-pause.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_play-pause.xpm
  39 +       $(INSTALL_DATA) pixmap_play-stop.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_play-stop.xpm
  40 +       $(INSTALL_DATA) pixmap_cursor-tool.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_cursor-tool.xpm
  41 +       $(INSTALL_DATA) pixmap_zoom-tool.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_zoom-tool.xpm
  42 +       $(INSTALL_DATA) pixmap_zoom-in.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_zoom-in.xpm
  43 +       $(INSTALL_DATA) pixmap_zoom-out.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_zoom-out.xpm
  44 +       $(INSTALL_DATA) pixmap_zoom-selection.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_zoom-selection.xpm
  45 +       $(INSTALL_DATA) pixmap_zoom-fit.xpm $(DESTDIR)$(PIXMAPS_DIR)/pixmap_zoom-fit.xpm
  46 +       $(INSTALL_DATA) gcdmaster.desktop $(DESTDIR)$(datadir)/applications/gcdmaster.desktop
  47
  48  installdirs:
  49 -       $(srcdir)/../mkinstalldirs $(bindir)
  50 -       $(srcdir)/../mkinstalldirs $(man1dir)
  51 -       $(srcdir)/../mkinstalldirs $(PIXMAPS_DIR)
  52 -       $(srcdir)/../mkinstalldirs $(datadir)/gnome/apps/Applications
  53 +       $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
  54 +       $(srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir)
  55 +       $(srcdir)/../mkinstalldirs $(DESTDIR)$(PIXMAPS_DIR)
  56 +       $(srcdir)/../mkinstalldirs $(DESTDIR)$(datadir)/applications
  57
  58  uninstall:
  59         rm -f $(bindir)/$(PRG) $(man1dir)/xcdrdao.1
  60 --- cdrdao-1.1.7/dao/Makefile.in.orig   Thu Dec 26 09:27:54 2002
  61 +++ cdrdao-1.1.7/dao/Makefile.in        Thu Dec 26 09:27:03 2002
  62 @@ -67,14 +67,14 @@
  63  all: $(PRG)
  64
  65  install: all installdirs
  66 -       $(INSTALL_PROGRAM) $(PRG) $(bindir)
  67 -       $(INSTALL_DATA) cdrdao.man $(man1dir)/cdrdao.1
  68 -       $(INSTALL_DATA) cdrdao.drivers $(DRIVER_TABLE_FILE)
  69 +       $(INSTALL_PROGRAM) $(PRG) $(DESTDIR)$(bindir)
  70 +       $(INSTALL_DATA) cdrdao.man $(DESTDIR)$(man1dir)/cdrdao.1
  71 +       $(INSTALL_DATA) cdrdao.drivers $(DESTDIR)$(DRIVER_TABLE_FILE)
  72
  73  installdirs:
  74 -       $(srcdir)/../mkinstalldirs $(bindir)
  75 -       $(srcdir)/../mkinstalldirs $(man1dir)
  76 -       $(srcdir)/../mkinstalldirs $(CDRDAO_DATA_DIR)
  77 +       $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
  78 +       $(srcdir)/../mkinstalldirs $(DESTDIR)$(man1dir)
  79 +       $(srcdir)/../mkinstalldirs $(DESTDIR)$(CDRDAO_DATA_DIR)
  80
  81  clean:
  82         rm -f *.o $(PRG)
  83 --- cdrdao-1.1.7/utils/Makefile.in.orig Sun Oct  6 20:53:56 2002
  84 +++ cdrdao-1.1.7/utils/Makefile.in      Thu Dec 26 09:31:35 2002
  85 @@ -53,10 +53,10 @@
  86  all: @utils_targets@
  87
  88  install: all installdirs
  89 -       $(INSTALL_PROGRAM) @utils_targets@ $(bindir)
  90 +       $(INSTALL_PROGRAM) @utils_targets@ $(DESTDIR)$(bindir)
  91
  92  installdirs:
  93 -       $(srcdir)/../mkinstalldirs $(bindir)
  94 +       $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
  95  #      $(srcdir)/../mkinstalldirs $(man1dir)
  96  #      $(srcdir)/../mkinstalldirs $(CDRDAO_DATA_DIR)
  97