Browse Source

Makefile.am: remove references to undefined variable DESTDIR

Nathalie Furmento 3 years ago
parent
commit
448a838755
4 changed files with 18 additions and 18 deletions
  1. 6 6
      doc/doxygen/Makefile.am
  2. 6 6
      doc/doxygen_dev/Makefile.am
  3. 3 3
      mpi/src/Makefile.am
  4. 3 3
      src/Makefile.am

+ 6 - 6
doc/doxygen/Makefile.am

@@ -40,19 +40,19 @@ EXTRA_DIST += $(DOX_HTML_DIR)
 endif
 DOX_HTML_SRCDIR=$(DOX_HTML_DIR)
 install-exec-hook:
-	$(MKDIR_P) $(DESTDIR)$(docdir)/manual/html
-	(cd $(DOX_HTML_SRCDIR) && $(PROG_FIND) . -type f -exec $(INSTALL_DATA) {} $(DESTDIR)$(docdir)/manual/html \;)
+	$(MKDIR_P) $(docdir)/manual/html
+	(cd $(DOX_HTML_SRCDIR) && $(PROG_FIND) . -type f -exec $(INSTALL_DATA) {} $(docdir)/manual/html \;)
 uninstall-hook:
-	rm -rf $(DESTDIR)$(docdir)/manual/html
+	rm -rf $(docdir)/manual/html
 else
 if STARPU_AVAILABLE_DOC
 EXTRA_DIST += $(top_srcdir)/doc/doxygen/html
 DOX_HTML_SRCDIR=$(top_srcdir)/doc/doxygen/html
 install-exec-hook:
-	$(MKDIR_P) $(DESTDIR)$(docdir)/manual/html
-	(cd $(DOX_HTML_SRCDIR) && $(PROG_FIND) . -type f -exec $(INSTALL_DATA) {} $(DESTDIR)$(docdir)/manual/html \;)
+	$(MKDIR_P) $(docdir)/manual/html
+	(cd $(DOX_HTML_SRCDIR) && $(PROG_FIND) . -type f -exec $(INSTALL_DATA) {} $(docdir)/manual/html \;)
 uninstall-hook:
-	rm -rf $(DESTDIR)$(docdir)/manual/html
+	rm -rf $(docdir)/manual/html
 endif
 if STARPU_AVAILABLE_DOC_PDF
 EXTRA_DIST += $(top_srcdir)/doc/doxygen/starpu.pdf

+ 6 - 6
doc/doxygen_dev/Makefile.am

@@ -40,19 +40,19 @@ EXTRA_DIST += $(DOX_HTML_DIR)
 endif
 DOX_HTML_SRCDIR=$(DOX_HTML_DIR)
 install-exec-hook:
-	$(MKDIR_P) $(DESTDIR)$(docdir)/manual/html_dev
-	(cd $(DOX_HTML_SRCDIR) && $(PROG_FIND) . -type f -exec $(INSTALL_DATA) {} $(DESTDIR)$(docdir)/manual/html_dev \;)
+	$(MKDIR_P) $(docdir)/manual/html_dev
+	(cd $(DOX_HTML_SRCDIR) && $(PROG_FIND) . -type f -exec $(INSTALL_DATA) {} $(docdir)/manual/html_dev \;)
 uninstall-hook:
-	rm -rf $(DESTDIR)$(docdir)/manual/html_dev
+	rm -rf $(docdir)/manual/html_dev
 else
 if STARPU_AVAILABLE_DOC
 EXTRA_DIST += $(top_srcdir)/doc/doxygen_dev/html_dev
 DOX_HTML_SRCDIR=$(top_srcdir)/doc/doxygen_dev/html_dev
 install-exec-hook:
-	$(MKDIR_P) $(DESTDIR)$(docdir)/manual/html_dev
-	(cd $(DOX_HTML_SRCDIR) && $(PROG_FIND) . -type f -exec $(INSTALL_DATA) {} $(DESTDIR)$(docdir)/manual/html_dev \;)
+	$(MKDIR_P) $(docdir)/manual/html_dev
+	(cd $(DOX_HTML_SRCDIR) && $(PROG_FIND) . -type f -exec $(INSTALL_DATA) {} $(docdir)/manual/html_dev \;)
 uninstall-hook:
-	rm -rf $(DESTDIR)$(docdir)/manual/html_dev
+	rm -rf $(docdir)/manual/html_dev
 endif
 if STARPU_AVAILABLE_DOC_PDF
 EXTRA_DIST += $(top_srcdir)/doc/doxygen_dev/starpu_dev.pdf

+ 3 - 3
mpi/src/Makefile.am

@@ -48,10 +48,10 @@ all-local: .libs/libstarpumpi-@STARPU_EFFECTIVE_VERSION@.lib
 endif STARPU_HAVE_MS_LIB
 
 install-exec-hook:
-	$(INSTALL) .libs/libstarpumpi-@STARPU_EFFECTIVE_VERSION@.def $(DESTDIR)$(libdir)
+	$(INSTALL) .libs/libstarpumpi-@STARPU_EFFECTIVE_VERSION@.def $(libdir)
 if STARPU_HAVE_MS_LIB
-	$(INSTALL) .libs/libstarpumpi-@STARPU_EFFECTIVE_VERSION@.lib $(DESTDIR)$(libdir)
-	$(INSTALL) .libs/libstarpumpi-@STARPU_EFFECTIVE_VERSION@.exp $(DESTDIR)$(libdir)
+	$(INSTALL) .libs/libstarpumpi-@STARPU_EFFECTIVE_VERSION@.lib $(libdir)
+	$(INSTALL) .libs/libstarpumpi-@STARPU_EFFECTIVE_VERSION@.exp $(libdir)
 endif STARPU_HAVE_MS_LIB
 
 endif STARPU_HAVE_WINDOWS

+ 3 - 3
src/Makefile.am

@@ -53,10 +53,10 @@ all-local: .libs/libstarpu-@STARPU_EFFECTIVE_VERSION@.lib
 endif STARPU_HAVE_MS_LIB
 
 install-exec-hook:
-	$(INSTALL) .libs/libstarpu-@STARPU_EFFECTIVE_VERSION@.def $(DESTDIR)$(libdir)
+	$(INSTALL) .libs/libstarpu-@STARPU_EFFECTIVE_VERSION@.def $(libdir)
 if STARPU_HAVE_MS_LIB
-	$(INSTALL) .libs/libstarpu-@STARPU_EFFECTIVE_VERSION@.lib $(DESTDIR)$(libdir)
-	$(INSTALL) .libs/libstarpu-@STARPU_EFFECTIVE_VERSION@.exp $(DESTDIR)$(libdir)
+	$(INSTALL) .libs/libstarpu-@STARPU_EFFECTIVE_VERSION@.lib $(libdir)
+	$(INSTALL) .libs/libstarpu-@STARPU_EFFECTIVE_VERSION@.exp $(libdir)
 endif STARPU_HAVE_MS_LIB
 
 endif STARPU_HAVE_WINDOWS