install codemodels in $(pkglibdir)

14 years ago · 4755e416e3
3 changed files with 10 additions and 3 deletions
--- a/6
+++ b/6
@ -1,3 +1,9 @@
+2011-12-29  Robert Larice
+ * src/xspice/icm/GNUmakefile.in ,
+ * src/xspice/icm/makedefs.in :
+  install codemodels in $(pkglibdir)
+    this was hardwired to $libdir/spice
+
 2011-12-28  Holger Vogt
 * cktdest.c, inpsymi.c: reduce memory leaks for command 'reset'
   bug no. 3229770
--- a/src/xspice/icm/GNUmakefile.in
+++ b/src/xspice/icm/GNUmakefile.in
@ -18,16 +18,16 @@ all:


 install: all
-	$(MKDIR_P) "$(DESTDIR)$(libdir)/spice"
+	$(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
 	for cm in $(CMDIRS) ; do \
-		$(INSTALL_PROGRAM) $$cm/$$cm.cm "$(DESTDIR)$(libdir)/spice" \
+		$(INSTALL_PROGRAM) $$cm/$$cm.cm "$(DESTDIR)$(pkglibdir)" \
 		|| exit 1; \
 	done


 uninstall:
 	for cm in $(CMDIRS) ; do \
-		rm -f "$(DESTDIR)$(libdir)/spice/$$cm.cm"; \
+		rm -f "$(DESTDIR)$(pkglibdir)/$$cm.cm"; \
 	done


--- a/src/xspice/icm/makedefs.in
+++ b/src/xspice/icm/makedefs.in
@ -62,4 +62,5 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 libdir = @libdir@
+pkglibdir = $(libdir)/@PACKAGE@