Cahnged default LCLIMPORTDIR

diff --git a/Makefile.in b/Makefile.in
index 27d5c1dbe08ba7c53a3984c85bb73cb11e5d8eaa..7b7c381a01dd1504e6590084f578a584799c28cf 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,7 +89,7 @@ subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = test/Makefile
+CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 
 RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
@@ -145,8 +145,6 @@ $(srcdir)/./stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4)
 
 distclean-hdr:
        -rm -f config.h
-test/Makefile: $(top_builddir)/config.status $(top_srcdir)/test/Makefile.in
-       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
 uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
@@ -252,7 +250,7 @@ GZIP_ENV = --best
 distdir: $(DISTFILES)
        -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)
        mkdir $(distdir)
-       $(mkinstalldirs) $(distdir)/config $(distdir)/test
+       $(mkinstalldirs) $(distdir)/config
        @for file in $(DISTFILES); do \
          if test -f $$file; then d=.; else d=$(srcdir); fi; \
          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \

diff --git a/config.h b/config.h
index be6e8f18b3ea6eff39c6caa398db497f2ce6a38e..8261f63cb47c56570e441df26ee5d3a812ff3542 100644 (file)
--- a/config.h
+++ b/config.h
@@ -7,7 +7,7 @@
 #define DEFAULT_LARCHPATH ".:/usr/local/share/lclint/lib:/af9/drl7x/reQuickFix/LCLintDev/lib:"
 
 /* LCLint's imports directory */
-#define DEFAULT_LCLIMPORTDIR "/usr/local/share/lclint/imports:/af9/drl7x/reQuickFix/LCLintDev/imports"
+#define DEFAULT_LCLIMPORTDIR ".:/usr/local/share/lclint/imports:/af9/drl7x/reQuickFix/LCLintDev/imports"
 
 /* gcc's private include directory */
 #define GCC_INCLUDE_DIR "/usr/lib/gcc-lib/i386-linux/2.7.2.1/include"

diff --git a/configure b/configure
index 445f118c4e33bb4091843b874c947940fe7e08f4..938fb48e7e431f0d21f5083e0c839b3118f8718e 100755 (executable)
--- a/configure
+++ b/configure
@@ -3343,7 +3343,7 @@ cat >>confdefs.h <<EOF
 EOF
 
 cat >>confdefs.h <<EOF
-#define DEFAULT_LCLIMPORTDIR "$myprefix/share/lclint/imports$PATH_SEPARATOR`pwd`/imports"
+#define DEFAULT_LCLIMPORTDIR ".$PATH_SEPARATOR$myprefix/share/lclint/imports$PATH_SEPARATOR`pwd`/imports"
 EOF
 
 # These used to be in herald.h

diff --git a/configure.ac b/configure.ac
index df2302862b806a77cc708dd66b912e042d873303..7838218006f3071612959b37f9350c70ad4912ff 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -117,7 +117,7 @@ AC_DEFINE_UNQUOTED(SYSTEM_LIBDIR, "$myprefix/include",
 AC_DEFINE_UNQUOTED(DEFAULT_LARCHPATH,
                    ".$PATH_SEPARATOR$myprefix/share/lclint/lib$PATH_SEPARATOR`pwd`/lib$PATH_SEPARATOR",
                    [The directory where LCLint's library files live])
-AC_DEFINE_UNQUOTED(DEFAULT_LCLIMPORTDIR, "$myprefix/share/lclint/imports$PATH_SEPARATOR`pwd`/imports",
+AC_DEFINE_UNQUOTED(DEFAULT_LCLIMPORTDIR, ".$PATH_SEPARATOR$myprefix/share/lclint/imports$PATH_SEPARATOR`pwd`/imports",
                    [LCLint's imports directory])
 
 # These used to be in herald.h