Fix compile-time-path-of-last-resort for lefty to find its scripts

diff --git a/cmd/lefty/Makefile.am b/cmd/lefty/Makefile.am
index e3d9a43c790a4b8f779715a69f4f8e2931f3bf0d..d03cca30421d81747afbac4a1f05007d77d5b1ac 100644 (file)
--- a/cmd/lefty/Makefile.am
+++ b/cmd/lefty/Makefile.am
@@ -24,14 +24,12 @@ SUBDIRS = ws os dot2l examples
 leftydir = $(pkgdatadir)/lefty
 pdfdir = $(pkgdatadir)/doc/pdf
 
-DEFINES=-DLEFTYPATH=\"$(LEFTYLIBDIR)\" -DHAVE_CONFIG_H
-
 AM_CPPFLAGS = \
        -I$(top_srcdir)/cmd/lefty/ws/x11 \
        -I$(top_srcdir)/cmd/lefty/os/unix \
        -I$(top_srcdir)/cmd/lefty/dot2l @XAW_INCLUDES@
 
-AM_CFLAGS = $(DEFINES) @X_CFLAGS@
+AM_CFLAGS = -DLEFTYDATADIR=\"$(leftydir)\" -DHAVE_CONFIG_H @X_CFLAGS@
 
 man = lefty.1
 pdf = lefty.pdf

diff --git a/cmd/lefty/common.c b/cmd/lefty/common.c
index 2478ca2e15dec8765b2168134690d67ab2aa79c5..30d1368a8d18b5e356afef62b207dc37a9b828b2 100644 (file)
--- a/cmd/lefty/common.c
+++ b/cmd/lefty/common.c
@@ -67,6 +67,11 @@ int init (char *aout) {
         extern HANDLE hinstance;
         char buf[260];
 #endif
+#ifdef LEFTYDATADIR
+    char *leftdatadir = LEFTYDATADIR;
+#else
+    char *leftdatadir = NULL;
+#endif
 
     c = 0;
     if (getenv ("INNETSCAPE"))
@@ -93,10 +98,14 @@ int init (char *aout) {
     if (!(leftypath = malloc (PATHINCR * PATHSIZE)))
         panic (POS, "init", "leftypath malloc failed");
     leftypath[0] = 0;
-    if ((s1 = getenv ("LEFTYPATH")))
-        strcat (leftypath, s1), strcat (leftypath, PATHSEPSTR);
-    if (*aout)
-        strcat (leftypath, aout), strcat (leftypath, PATHSEPSTR);
+    if ((s1 = getenv ("LEFTYPATH"))) {
+        strcat (leftypath, s1);
+       strcat (leftypath, PATHSEPSTR);
+    }
+    if (*aout) {
+        strcat (leftypath, aout);
+        strcat (leftypath, PATHSEPSTR);
+    }
     for (k = 0; k < 2; k++) {
         if (k == 0)
             s1 = aout;
@@ -116,6 +125,10 @@ int init (char *aout) {
         if (leftypath[0])
             strcat (leftypath, PATHSEPSTR);
     }
+    if (leftdatadir) {    /* support a compile-time path as last resort */
+       strcat (leftypath, leftdatadir);
+       strcat (leftypath, PATHSEPSTR);
+    }
     if (!(leftyoptions = getenv ("LEFTYOPTIONS")))
         leftyoptions = "";
     putenv (WINSYS);