Improve support for relative search paths

diff --git a/configure.ac b/configure.ac
index 3cded34aa2897ac6634250ca6a66aa310faa124f..b2bddd8b4a8606b40dcffa9f30deab3eee5de2a9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -28,13 +28,16 @@ case "${host}" in
        *apple*)   SYS="MAC" ;;
        *)         SYS="X11" ;;
 esac
-if test "$SYS" = "WIN"; then
-       ac_default_prefix="/"
-fi
 AM_CONDITIONAL([SYS_WIN], test "$SYS" = "WIN")
 AM_CONDITIONAL([SYS_MAC], test "$SYS" = "MAC")
 AM_CONDITIONAL([SYS_X11], test "$SYS" = "X11")
 
+# Check for relative build
+AC_ARG_ENABLE(relative, [AS_HELP_STRING([--enable-relative],
+       [enable runtime search paths @<:@default=no@:>@])],
+       [DOTS=".."; ac_default_prefix="/"])
+AC_SUBST([DOTS])
+
 # Output
 AC_CONFIG_FILES([
        Makefile

diff --git a/src/Makefile.am b/src/Makefile.am
index e31c39463e4f30824660944c681d4b91b0fbdd7c..fb3d4f6a69df51d6a1c4f3c504dc572f99dfef08 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,18 +12,16 @@ aweather_SOURCES  = main.c \
        aweather-gui.c      aweather-gui.h \
        aweather-location.c aweather-location.h
 aweather_CPPFLAGS = \
-       -DHTMLDIR="\"$(dots)$(htmldir)\"" \
-       -DICONDIR="\"$(dots)$(datadir)/icons\"" \
-       -DPKGDATADIR="\"$(dots)$(pkgdatadir)\"" \
-       -DPLUGINSDIR="\"$(dots)$(pkglibdir)\""
+       -DHTMLDIR="\"$(DOTS)$(htmldir)\"" \
+       -DICONDIR="\"$(DOTS)$(datadir)/icons\"" \
+       -DPKGDATADIR="\"$(DOTS)$(pkgdatadir)\"" \
+       -DPLUGINSDIR="\"$(DOTS)$(pkglibdir)\""
 aweather_LDADD    = $(GRITS_LIBS)
 
 wsr88ddec         = wsr88ddec.c
 wsr88ddec_LDADD   = $(GLIB_LIBS) -lbz2
 
 if SYS_WIN
-dots = ..
-
 wsr88ddec_LDFLAGS     = -mwindows
 
 aweather_SOURCES     += resource.rc

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index b873d1b34ea3d0859e54f41805c6e30809d12e1e..7cc1b810611d7d3a8bfe8053fcb10679c94eb8e6 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -5,7 +5,6 @@ LIBS        = $(GRITS_LIBS)
 
 if SYS_WIN
 AM_LDFLAGS += -no-undefined
-dots = ..
 endif
 if !SYS_MAC
 AM_LDFLAGS += -Wl,--as-needed
@@ -19,7 +18,7 @@ alert_la_SOURCES = \
        alert.c      alert.h \
        alert-info.c alert-info.h
 alert_la_CPPFLAGS = \
-       -DPKGDATADIR="\"$(dots)$(pkgdatadir)\""
+       -DPKGDATADIR="\"$(DOTS)$(pkgdatadir)\""
 alert_la_LIBADD  = $(GRITS_LIBS)
 
 if HAVE_RSL
@@ -31,7 +30,7 @@ radar_la_SOURCES = \
        ../aweather-location.c \
        ../aweather-location.h
 radar_la_CPPFLAGS = \
-       -DPKGDATADIR="\"$(dots)$(pkgdatadir)\"" \
+       -DPKGDATADIR="\"$(DOTS)$(pkgdatadir)\"" \
        -I$(top_srcdir)/src
 radar_la_LIBADD  = $(RSL_LIBS) $(GRITS_LIBS)
 endif