diff -urN nautilus-1.0.org/Makefile.am nautilus-1.0/Makefile.am --- nautilus-1.0.org/Makefile.am Sat Mar 3 01:53:45 2001 +++ nautilus-1.0/Makefile.am Mon Apr 2 00:04:21 2001 @@ -117,23 +117,23 @@ ################################################################## dist-hook: nautilus.spec - cp nautilus.spec $(distdir) + cp nautilus.spec $(DESTDIR)$(distdir) # This is ridiculous, but automake apparently won't allow conditionals # in EXTRA_DIST. - mkdir -p $(distdir)/eazel-logos + mkdir -p $(DESTDIR)$(distdir)/eazel-logos list='$(EAZEL_LOGOS_ICONS)'; \ for i in $$list; \ do \ - cp $$i $(distdir)/eazel-logos; \ + cp $$i $(DESTDIR)$(distdir)/eazel-logos; \ done - mkdir -p $(distdir)/eazel-logos/throbber + mkdir -p $(DESTDIR)$(distdir)/eazel-logos/throbber list='$(EAZEL_LOGOS_THROBBER)'; \ for i in $$list; \ do \ - cp $$i $(distdir)/eazel-logos/throbber; \ + cp $$i $(DESTDIR)$(distdir)/eazel-logos/throbber; \ done ################################################################## @@ -155,18 +155,18 @@ # an automake DATA rule because it's easier to deal with the relative paths # like this. - $(mkinstalldirs) $(icondir) + $(mkinstalldirs) $(DESTDIR)$(icondir) @list='$(EAZEL_LOGOS_ICONS)'; \ for i in $$list; \ do \ - echo $(INSTALL_PROGRAM) $$i $(icondir)/`basename $$i`; \ - $(INSTALL_PROGRAM) $$i $(icondir)/`basename $$i`; \ + echo $(INSTALL_PROGRAM) $$i $(DESTDIR)$(icondir)/`basename $$i`; \ + $(INSTALL_PROGRAM) $$i $(DESTDIR)$(icondir)/`basename $$i`; \ done - $(mkinstalldirs) $(throbberdir) + $(mkinstalldirs) $(DESTDIR)$(throbberdir) @list='$(EAZEL_LOGOS_THROBBER)'; \ for i in $$list; \ do \ - echo $(INSTALL_PROGRAM) $$i $(throbberdir)/`basename $$i`; \ - $(INSTALL_PROGRAM) $$i $(throbberdir)/`basename $$i`; \ + echo $(INSTALL_PROGRAM) $$i $(DESTDIR)$(throbberdir)/`basename $$i`; \ + $(INSTALL_PROGRAM) $$i $(DESTDIR)$(throbberdir)/`basename $$i`; \ done diff -urN nautilus-1.0.org/components/services/trilobite/helper/Makefile.am nautilus-1.0/components/services/trilobite/helper/Makefile.am --- nautilus-1.0.org/components/services/trilobite/helper/Makefile.am Fri Oct 27 04:18:59 2000 +++ nautilus-1.0/components/services/trilobite/helper/Makefile.am Sun Apr 1 23:57:09 2001 @@ -11,10 +11,10 @@ && mv $(srcdir)/eazel-helper.security.tmp $(srcdir)/eazel-helper.security install-data-local: $(PAM_FILES) - mkdir -p $(sysconfdir)/security/console.apps - cp $(srcdir)/eazel-helper.security $(sysconfdir)/security/console.apps/eazel-helper - mkdir -p $(sysconfdir)/pam.d - cp $(srcdir)/eazel-helper.pam $(sysconfdir)/pam.d/eazel-helper + mkdir -p $(DESTDIR)$(sysconfdir)/security/console.apps + cp $(srcdir)/eazel-helper.security $(DESTDIR)$(sysconfdir)/security/console.apps/eazel-helper + mkdir -p $(DESTDIR)$(sysconfdir)/pam.d + cp $(srcdir)/eazel-helper.pam $(DESTDIR)$(sysconfdir)/pam.d/eazel-helper ## This and bin_SCRIPTS is a hack to ensure ## that eazel-helper.security is build during