Summary: minor, always pass on SXE_DYLD_PATH with pointers to the lwlibdir

[sxemacs] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 6b8791e..32dc335 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -247,9 +247,10 @@ AALFILE = $(bldlispdir)/auto-autoloads.el
 AALCFILE = $(bldlispdir)/auto-autoloads.elc
 BITCH = $(SXEMACS) -batch
 SXE_DYLD_PATH = $(bldsrcdir):$(bldsrcdir)/$(LT_OBJDIR):$(bldlwlibdir):$(bldlwlibdir)/$(LT_OBJDIR):$(DESTDIR)$(libdir)
-BITCHENV = DYLD_LIBRARY_PATH=$(SXE_DYLD_PATH):$$DYLD_LIBRARY_PATH:$(DYLD_LIBRARY_PATH) \
+BATCHENV = DYLD_LIBRARY_PATH=$(SXE_DYLD_PATH):$$DYLD_LIBRARY_PATH:$(DYLD_LIBRARY_PATH) \
        LD_LIBRARY_PATH=$(SXE_DYLD_PATH):$$LD_LIBRARY_PATH:$(LD_LIBRARY_PATH) \
-       SHLIB_PATH=$(SXE_DYLD_PATH):$$SHLIB_PATH:$(SHLIB_PATH) \
+       SHLIB_PATH=$(SXE_DYLD_PATH):$$SHLIB_PATH:$(SHLIB_PATH)
+BITCHENV = $(BATCHENV) \
        EMACSDEBUGPATHS=1 EMACSPACKAGEPATH= \
        SOURCE_TREE_ROOT=$(sxe_srcdir) \
        BUILD_TREE_ROOT=$(sxe_blddir)
@@ -339,6 +340,7 @@ sxemacs.dmp: $(SXEMACS) $(archlib_DATA) $(bldlispdir)/update-elc.stamp
                        (cd $(LT_OBJDIR); \
                        $(LN_S) -f ../$@ $@); \
                fi; \
+               $(BITCHENV) \
                SOURCE_TREE_ROOT= BUILD_TREE_ROOT= \
                        $(BITCH) -f list-load-path-shadows; \
        fi