[cgma-dev] r1608 - in cgm/trunk/itaps: . SIDL

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-02-21 11:09:54 -0600 (Thu, 21 Feb 2008)
New Revision: 1608

Modified:
   cgm/trunk/itaps/Makefile.am
   cgm/trunk/itaps/SIDL/Makefile.am
Log:
fix paths written to installed makefile stubs

Modified: cgm/trunk/itaps/Makefile.am
===================================================================
--- cgm/trunk/itaps/Makefile.am	2008-02-21 16:57:23 UTC (rev 1607)
+++ cgm/trunk/itaps/Makefile.am	2008-02-21 17:09:54 UTC (rev 1608)
@@ -82,7 +82,7 @@
 install-data-hook:
 	echo "iGeom_SRCDIR=${includedir}" >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc
 	echo "iGeom_BLDDIR=${includedir}" >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc
-	echo "iGeom_DIR=${DESTDIR}${cfgdir}/.." >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc
+	echo "iGeom_DIR=${cfgdir}" >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc
 	echo "iGeom_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc
 	echo "CGM_LDFLAGS=-L${libdir}" >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc
 	echo "CGM_INCLUDEDIR=${includedir}" >> $(DESTDIR)$(cfgdir)/iGeom-Defs.inc

Modified: cgm/trunk/itaps/SIDL/Makefile.am
===================================================================
--- cgm/trunk/itaps/SIDL/Makefile.am	2008-02-21 16:57:23 UTC (rev 1607)
+++ cgm/trunk/itaps/SIDL/Makefile.am	2008-02-21 17:09:54 UTC (rev 1608)
@@ -146,7 +146,7 @@
 # 'make prefix=/foo install', we don't know the correct install
 # directory until we're doing the install.
 install-data-hook:
-	echo "iGeom_DIR=${DESTDIR}${cfgdir}/.." >> $(DESTDIR)$(cfgdir)/iGeom-SIDL-Defs.inc
+	echo "iGeom_DIR=${cfgdir}" >> $(DESTDIR)$(cfgdir)/iGeom-SIDL-Defs.inc
 	echo "iGeom_SIDLLIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iGeom-SIDL-Defs.inc
 	echo "iGeom_SIDLINCLUDEDIR=${includedir}/SIDL" >> $(DESTDIR)$(cfgdir)/iGeom-SIDL-Defs.inc
 	(cd gserver; install -d ${includedir}/SIDL; install -t ${includedir}/SIDL ${SERVER_HDRS})