--- a/Makefile 2011-08-17 14:26:11.661721605 +0400
+++ b/Makefile 2011-08-17 14:27:36.059721596 +0400
@@ -67,12 +67,12 @@
## Install either the static or the shared lib, based on the value of
## LIBRARY_TYPE
install_library_type:
- ${MKDIR} ${bindir}
- ${MKDIR} ${libdir}/${TARNAME}/${LIBRARY_TYPE}
- ${MKDIR} ${libdir}/gnat/${TARNAME}
- ${MKDIR} ${datadir}/examples
- ${MKDIR} ${includedir}/${TARNAME}
- ${MKDIR} ${datadir}/gps/plug-ins
+ ${MKDIR} ${DESTDIR}/${bindir}
+ ${MKDIR} ${DESTDIR}/${libdir}/${TARNAME}/${LIBRARY_TYPE}
+ ${MKDIR} ${DESTDIR}/${libdir}/gnat/${TARNAME}
+ ${MKDIR} ${DESTDIR}/${datadir}/examples
+ ${MKDIR} ${DESTDIR}/${includedir}/${TARNAME}
+ ${MKDIR} ${DESTDIR}/${datadir}/gps/plug-ins
${MAKE} -C src -f Makefile.gnatcoll libinstall
${MAKE} -C src -f Makefile.python libinstall
${MAKE} -C docs install
@@ -87,9 +87,9 @@
ifeq (${WITH_GMP},yes)
${MAKE} -C src -f Makefile.gmp libinstall
endif
- ${CP} distrib/gnatcoll_gps.xml ${datadir}/gps/plug-ins
- ${CP} distrib/gnatcoll_runtime.xml ${datadir}/gps/plug-ins
- ${CP} distrib/*.gpr ${libdir}/gnat
+ ${CP} distrib/gnatcoll_gps.xml ${DESTDIR}/${datadir}/gps/plug-ins
+ ${CP} distrib/gnatcoll_runtime.xml ${DESTDIR}/${datadir}/gps/plug-ins
+ ${CP} distrib/*.gpr ${DESTDIR}/${libdir}/gnat
install_static:
${MAKE} LIBRARY_TYPE=static install_library_type
--- a/Makefile.conf.in 2011-08-17 14:33:19.486721547 +0400
+++ b/Makefile.conf.in 2011-08-17 14:34:57.466721536 +0400
@@ -111,8 +111,8 @@
# the dynamic library
installobj:
- ${CP} -p ${LIBDIR}*.ali ${libdir}/${TARNAME}/${LIBRARY_TYPE}
- ${CP} -p ${LIBDIR}${LIBFULL} ${libdir}/${TARNAME}/${LIBRARY_TYPE}
+ ${CP} -p ${LIBDIR}*.ali ${DESTDIR}/${libdir}/${TARNAME}/${LIBRARY_TYPE}
+ ${CP} -p ${LIBDIR}${LIBFULL} ${DESTDIR}/${libdir}/${TARNAME}/${LIBRARY_TYPE}
# Create symbolic links with version numbers for the libraries, in
# ${prefix}/lib/. The library itself is not duplicated and is found in the
@@ -123,7 +123,7 @@
.PHONY: installlinks
installlinks:
ifeq (${LIBRARY_TYPE},relocatable)
- ${RM} ${libdir}/${LIBNAME}*
+ ${RM} ${DESTDIR}/${libdir}/${LIBNAME}*
ifneq (${OS},Windows_NT)
${RM} ${libdir}/${TARNAME}/${LIBRARY_TYPE}/${LIBNAME}
@@ -146,11 +146,11 @@
# we in fact have the library dir as well, which doesn't contain any source, and
# install would complain.
installsources:
- @${CP} -p ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}} ${includedir}/${TARNAME}
+ @${CP} -p ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}} ${DESTDIR}/${includedir}/${TARNAME}
ifeq (${OS},Windows_NT)
@cd ${includedir}/${TARNAME}; ls ${notdir ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}}} | grep -v unix > ${libdir}/gnat/${TARNAME}/${basename ${PROJECT}}.lgpr
else
- @cd ${includedir}/${TARNAME}; ls ${notdir ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}}} | grep -v win32 > ${libdir}/gnat/${TARNAME}/${basename ${PROJECT}}.lgpr
+ @cd ${includedir}/${TARNAME}; ls ${notdir ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}}} | grep -v win32 > ${DESTDIR}/${gprdir}/${TARNAME}/${basename ${PROJECT}}.lgpr
endif
force:
--- a/Makefile.conf.in 2011-08-17 14:40:59.894721485 +0400
+++ b/Makefile.conf.in 2011-08-17 14:41:14.915721487 +0400
@@ -150,7 +150,7 @@
ifeq (${OS},Windows_NT)
@cd ${includedir}/${TARNAME}; ls ${notdir ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}}} | grep -v unix > ${libdir}/gnat/${TARNAME}/${basename ${PROJECT}}.lgpr
else
- @cd ${includedir}/${TARNAME}; ls ${notdir ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}}} | grep -v win32 > ${DESTDIR}/${gprdir}/${TARNAME}/${basename ${PROJECT}}.lgpr
+ -${MKDIR} ${DESTDIR}/${gprdir}/gnatcoll && @cd ${DESTDIR}/${includedir}/${TARNAME}; ls ${notdir ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}}} | grep -v win32 > ${DESTDIR}/${gprdir}/${TARNAME}/${basename ${PROJECT}}.lgpr
endif
force:
--- a/Makefile.conf.in 2011-08-17 14:54:49.773721367 +0400
+++ b/Makefile.conf.in 2011-08-17 14:55:26.835721369 +0400
@@ -126,12 +126,12 @@
${RM} ${DESTDIR}/${libdir}/${LIBNAME}*
ifneq (${OS},Windows_NT)
- ${RM} ${libdir}/${TARNAME}/${LIBRARY_TYPE}/${LIBNAME}
- ${RM} ${libdir}/${TARNAME}/${LIBRARY_TYPE}/${LIBNAME}.${basename ${VERSION}}
- cd ${libdir}/${TARNAME}/${LIBRARY_TYPE}; ${LN_S} ${LIBFULL} ${LIBNAME}
- cd ${libdir}/${TARNAME}/${LIBRARY_TYPE}; ${LN_S} ${LIBFULL} ${LIBNAME}.${basename ${VERSION}}
- cd ${libdir}; ${LN_S} ${TARNAME}/${LIBRARY_TYPE}/${LIBFULL} ${LIBNAME}.${basename ${VERSION}}
- cd ${libdir}; ${LN_S} ${TARNAME}/${LIBRARY_TYPE}/${LIBFULL} ${LIBNAME}.${VERSION}
+ ${RM} ${DESTDIR}/${libdir}/${TARNAME}/${LIBRARY_TYPE}/${LIBNAME}
+ ${RM} ${DESTDIR}/${libdir}/${TARNAME}/${LIBRARY_TYPE}/${LIBNAME}.${basename ${VERSION}}
+ cd ${DESTDIR}/${libdir}/${TARNAME}/${LIBRARY_TYPE}; ${LN_S} ${LIBFULL} ${LIBNAME}
+ cd ${DESTDIR}/${libdir}/${TARNAME}/${LIBRARY_TYPE}; ${LN_S} ${LIBFULL} ${LIBNAME}.${basename ${VERSION}}
+ cd ${DESTDIR}/${libdir}; ${LN_S} ${TARNAME}/${LIBRARY_TYPE}/${LIBFULL} ${LIBNAME}.${basename ${VERSION}}
+ cd ${DESTDIR}/${libdir}; ${LN_S} ${TARNAME}/${LIBRARY_TYPE}/${LIBFULL} ${LIBNAME}.${VERSION}
endif
endif
--- a/docs/Makefile.in 2011-08-17 15:16:14.254721195 +0400
+++ b/docs/Makefile.in 2011-08-17 15:16:32.340721193 +0400
@@ -23,7 +23,7 @@
.PHONY: install
install:
- ${MKDIR} ${datadir}/doc/gnatcoll
+ ${MKDIR} ${DESTDIR}${datadir}/doc/gnatcoll
-${CP} gnatcoll.html ${datadir}/doc/gnatcoll/
-${CP} gnatcoll.pdf ${datadir}/doc/gnatcoll/
--- a/docs/Makefile.in 2011-08-17 15:18:35.237721171 +0400
+++ b/docs/Makefile.in 2011-08-17 15:19:08.460721181 +0400
@@ -24,8 +24,8 @@
.PHONY: install
install:
${MKDIR} ${DESTDIR}${datadir}/doc/gnatcoll
- -${CP} gnatcoll.html ${datadir}/doc/gnatcoll/
- -${CP} gnatcoll.pdf ${datadir}/doc/gnatcoll/
+ -${CP} gnatcoll.html ${DESTDIR}/${datadir}/doc/gnatcoll/
+ -${CP} gnatcoll.pdf ${DESTDIR}/${datadir}/doc/gnatcoll/
.PHONY: clean-temp-files
clean-temp-files:
--- a/src/Makefile.tools 2011-08-17 15:22:06.093721148 +0400
+++ b/src/Makefile.tools 2011-08-17 15:22:14.412721147 +0400
@@ -15,4 +15,4 @@
${GPRBUILD} -m -j${PROCESSORS} -P$(PROJECT) $@ -p -largs $(POSTGRES_PATH)
installbin: force
- $(CP) obj/gnatcoll_db2ada $(bindir)
+ $(CP) obj/gnatcoll_db2ada ${DESTDIR}/$(bindir)
--- a/Makefile 2011-08-17 15:59:56.399720837 +0400
+++ b/Makefile 2011-08-17 16:00:31.517720828 +0400
@@ -89,7 +89,7 @@
endif
${CP} distrib/gnatcoll_gps.xml ${DESTDIR}/${datadir}/gps/plug-ins
${CP} distrib/gnatcoll_runtime.xml ${DESTDIR}/${datadir}/gps/plug-ins
- ${CP} distrib/*.gpr ${DESTDIR}/${libdir}/gnat
+ ${MKDIR} ${DESTDIR}/${gprdir}/gnatcoll && ${CP} distrib/*.gpr ${DESTDIR}/${gprdir}/
install_static:
${MAKE} LIBRARY_TYPE=static install_library_type
--- a/Makefile.conf.in 2011-08-17 22:34:52.378129088 +0400
+++ b/Makefile.conf.in 2011-08-17 22:35:07.607128318 +0400
@@ -148,9 +148,9 @@
installsources:
@${CP} -p ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}} ${DESTDIR}/${includedir}/${TARNAME}
ifeq (${OS},Windows_NT)
- @cd ${includedir}/${TARNAME}; ls ${notdir ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}}} | grep -v unix > ${libdir}/gnat/${TARNAME}/${basename ${PROJECT}}.lgpr
+ cd ${includedir}/${TARNAME}; ls ${notdir ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}}} | grep -v unix > ${libdir}/gnat/${TARNAME}/${basename ${PROJECT}}.lgpr
else
- -${MKDIR} ${DESTDIR}/${gprdir}/gnatcoll && @cd ${DESTDIR}/${includedir}/${TARNAME}; ls ${notdir ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}}} | grep -v win32 > ${DESTDIR}/${gprdir}/${TARNAME}/${basename ${PROJECT}}.lgpr
+ -${MKDIR} ${DESTDIR}/${gprdir}/gnatcoll && cd ${DESTDIR}/${includedir}/${TARNAME}; ls ${notdir ${wildcard ${addsuffix *.ad[bs], ${SRCDIRS}}}} | grep -v win32 > ${DESTDIR}/${gprdir}/${TARNAME}/${basename ${PROJECT}}.lgpr
endif
force:
--- a/Makefile.gnat 2011-08-17 22:35:20.722128250 +0400
+++ b/Makefile.gnat 2011-08-17 22:35:26.911128165 +0400
@@ -90,4 +90,4 @@
done
install-gnat:
- @cd gnat; ${CP} $(GNAT_SOURCES_FOR_GNATCOLL) ${includedir}/${TARNAME}
+ cd gnat; ${CP} $(GNAT_SOURCES_FOR_GNATCOLL) ${includedir}/${TARNAME}
