[project @ 2003-05-16 10:14:20 by simonmar]

Now that we have auto packages, it makes sense to keep all the
interfaces for hierarchical libraries in the same directory tree.  So
now, instead of putting interfaces for package P in $libdir/imports/P,
we put them all in $libdir/imports.

Interfaces for old non-auto non-hierarchical packages now go in
$libdir/hslibs-imports/P for package P.

diff --git a/mk/package.mk b/mk/package.mk
index 4ea7e96..d06a6c6 100644 (file)
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
 # -----------------------------------------------------------------------------

-# $Id: package.mk,v 1.23 2003/03/31 12:42:04 simonmar Exp $
+# $Id: package.mk,v 1.24 2003/05/16 10:14:20 simonmar Exp $

 
 ifneq "$(PACKAGE)" ""
 
 
 ifneq "$(PACKAGE)" ""
 

@@ -88,7 +88,11 @@ endif
 # The interface files are put inside the $(libdir), since they
 # might (potentially) be platform specific..
 
 # The interface files are put inside the $(libdir), since they
 # might (potentially) be platform specific..
 

-ifacedir = $(libdir)/imports/$(PACKAGE)
+ifeq "$(HIERARCHICAL_LIB)" "YES"
+ifacedir = $(libdir)/imports
+else
+ifacedir = $(libdir)/hslibs-imports/$(PACKAGE)
+endif

 
 # If the lib consists of a hierachy of modules, we must retain the directory
 # structure when we install the interfaces.
 
 # If the lib consists of a hierachy of modules, we must retain the directory
 # structure when we install the interfaces.