diff --git a/ChangeLog b/ChangeLog index 7e2deb746..af0c7761d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/src/xspice/icm/GNUmakefile.in b/src/xspice/icm/GNUmakefile.in index ae0f4343a..897769f6d 100644 --- 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 diff --git a/src/xspice/icm/makedefs.in b/src/xspice/icm/makedefs.in index 5fe3cdc63..39467e00a 100644 --- 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@