compiz-DESTDIR.patch

   1 --- compiz-0.5.2/gtk/gnome/Makefile.am.orig     2007-05-11 19:19:31.000000000 +0200
   2 +++ compiz-0.5.2/gtk/gnome/Makefile.am  2007-08-04 21:21:03.842196678 +0200
   3 @@ -1,4 +1,4 @@
   4 -moduledir = $(DESTDIR)$(windowsettingslibdir)/window-manager-settings
   5 +moduledir = $(windowsettingslibdir)/window-manager-settings
   6
   7  if USE_GNOME
   8  libcompiz_la_LDFLAGS = -export-dynamic -avoid-version -rpath $(moduledir)
   9 @@ -8,7 +8,7 @@
  10         compiz-window-manager.h
  11  libcompiz_module     = libcompiz.la
  12
  13 -desktopfilesdir              = $(DESTDIR)$(windowsettingsdatadir)/gnome/wm-properties
  14 +desktopfilesdir              = $(windowsettingsdatadir)/gnome/wm-properties
  15  desktopfiles_in_files = compiz.desktop.in
  16  desktopfiles_files    = $(desktopfiles_in_files:.desktop.in=.desktop)
  17
  18 @@ -16,7 +16,7 @@
  19
  20  if USE_GNOME_KEYBINDINGS
  21
  22 -xmldir       = $(DESTDIR)$(keybindingsdir)
  23 +xmldir       = $(keybindingsdir)
  24  xml_in_files = 50-compiz-desktop-key.xml.in 50-compiz-key.xml.in
  25  xml_files    = $(xml_in_files:.xml.in=.xml)
  26
  27 @@ -25,38 +25,38 @@
  28  endif
  29
  30  install-exec-local:
  31 -       if mkdir -p $(moduledir) && test -w $(moduledir); then ( \
  32 +       if mkdir -p $(DESTDIR)$(moduledir) && test -w $(DESTDIR)$(moduledir); then ( \
  33                 $(LIBTOOL) --mode=install $(INSTALL) $(libcompiz_module) \
  34 -               $(moduledir) \
  35 +               $(DESTDIR)$(moduledir) \
  36                 ); \
  37         fi
  38
  39  install-data-local:
  40 -       if mkdir -p $(desktopfilesdir) && test -w $(desktopfilesdir); then ( \
  41 +       if mkdir -p $(DESTDIR)$(desktopfilesdir) && test -w $(DESTDIR)$(desktopfilesdir); then ( \
  42                 $(INSTALL) -m 644 $(desktopfiles_files) \
  43 -               $(desktopfilesdir) \
  44 +               $(DESTDIR)$(desktopfilesdir) \
  45                 ); \
  46         fi
  47  if USE_GNOME_KEYBINDINGS
  48 -       if mkdir -p $(xmldir) && test -w $(xmldir); then ( \
  49 +       if mkdir -p $(DESTDIR)$(xmldir) && test -w $(DESTDIR)$(xmldir); then ( \
  50                 $(INSTALL) -m 644 $(xml_files) \
  51 -               $(xmldir) \
  52 +               $(DESTDIR)$(xmldir) \
  53                 ); \
  54         fi
  55  endif
  56
  57  uninstall-local:
  58 -       if test -w $(moduledir); then ( \
  59 -               rm -f $(moduledir)/libcompiz.* \
  60 +       if test -w $(DESTDIR)$(moduledir); then ( \
  61 +               rm -f $(DESTDIR)$(moduledir)/libcompiz.* \
  62                 ); \
  63         fi
  64 -       if test -w $(desktopfilesdir); then ( \
  65 -               rm -f $(desktopfilesdir)/compiz.desktop \
  66 +       if test -w $(DESTDIR)$(desktopfilesdir); then ( \
  67 +               rm -f $(DESTDIR)$(desktopfilesdir)/compiz.desktop \
  68                 ); \
  69         fi
  70  if USE_GNOME_KEYBINDINGS
  71 -       if test -w $(xmldir); then ( \
  72 -               rm -f $(xmldir)/50-compiz*key.xml \
  73 +       if test -w $(DESTDIR)$(xmldir); then ( \
  74 +               rm -f $(DESTDIR)$(xmldir)/50-compiz*key.xml \
  75                 ); \
  76         fi
  77  endif