Author: arekm Date: Sun Dec 31 22:47:19 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - fix destdir
---- Files affected: SOURCES: compiz-DESTDIR.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: SOURCES/compiz-DESTDIR.patch diff -u /dev/null SOURCES/compiz-DESTDIR.patch:1.1 --- /dev/null Sun Dec 31 23:47:19 2006 +++ SOURCES/compiz-DESTDIR.patch Sun Dec 31 23:47:14 2006 @@ -0,0 +1,51 @@ +diff -urN compiz-0.3.6.org/gtk/gnome/Makefile.am compiz-0.3.6/gtk/gnome/Makefile.am +--- compiz-0.3.6.org/gtk/gnome/Makefile.am 2006-12-15 22:27:42.000000000 +0100 ++++ compiz-0.3.6/gtk/gnome/Makefile.am 2006-12-31 23:44:57.180927250 +0100 +@@ -1,4 +1,4 @@ +-moduledir = $(DESTDIR)$(windowsettingslibdir)/window-manager-settings ++moduledir = $(windowsettingslibdir)/window-manager-settings + + if USE_GNOME + libcompiz_la_LDFLAGS = -export-dynamic -avoid-version -rpath $(moduledir) +@@ -8,32 +8,32 @@ + compiz-window-manager.h + libcompiz_module = libcompiz.la + +-desktopfilesdir = $(DESTDIR)$(windowsettingsdatadir)/gnome/wm-properties ++desktopfilesdir = $(windowsettingsdatadir)/gnome/wm-properties + desktopfiles_in_files = compiz.desktop.in + desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop) + noinst_DATA = $(desktopfiles_files) + + install-exec-local: +- if mkdir -p $(moduledir) && test -w $(moduledir); then ( \ ++ if mkdir -p $(DESTDIR)$(moduledir) && test -w $(DESTDIR)$(moduledir); then ( \ + $(LIBTOOL) --mode=install $(INSTALL) $(libcompiz_module) \ +- $(moduledir) \ ++ $(DESTDIR)$(moduledir) \ + ); \ + fi + + install-data-local: +- if mkdir -p $(desktopfilesdir) && test -w $(desktopfilesdir); then ( \ ++ if mkdir -p $(DESTDIR)$(desktopfilesdir) && test -w $(DESTDIR)$(desktopfilesdir); then ( \ + $(INSTALL) -m 644 $(desktopfiles_files) \ +- $(desktopfilesdir) \ ++ $(DESTDIR)$(desktopfilesdir) \ + ); \ + fi + + uninstall-local: +- if test -w $(moduledir); then ( \ +- rm -f $(moduledir)/libcompiz.* \ ++ if test -w $(DESTDIR)$(moduledir); then ( \ ++ rm -f $(DESTDIR)$(moduledir)/libcompiz.* \ + ); \ + fi +- if test -w $(desktopfilesdir); then ( \ +- rm -f $(desktopfilesdir)/compiz.desktop \ ++ if test -w $(DESTDIR)$(desktopfilesdir); then ( \ ++ rm -f $(DESTDIR)$(desktopfilesdir)/compiz.desktop \ + ); \ + fi + ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
