Changeset 6248 for geovis/trunk

Timestamp:

Apr 5, 2016, 1:28:08 PM (9 years ago)

Author:

ldelgass

Message:

Add configure var for resources dir

Location:

geovis/trunk

Files:

• Makefile.in (modified) (2 diffs)
• configure (modified) (2 diffs)
• configure.ac (modified) (2 diffs)

geovis/trunk/Makefile.in

@@ -38 +38 @@
 SVN_VERSION     = $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
 STATSDIR        = @STATSDIR@
+RESOURCES_DIR   = @RESOURCES_DIR@
 
 GL_LIB_SPEC     = -lGL -lm
@@ -197 +198 @@
 
 install-resources:
-        $(MKDIR_P) $(libdir)/resources
+        $(MKDIR_P) $(RESOURCES_DIR)
         @for i in $(resources) ; do \
             echo "installing $$i..." ; \
-            $(INSTALL_DATA) $$i $(libdir)/resources ; \
+            $(INSTALL_DATA) $$i $(RESOURCES_DIR) ; \
         done
 

geovis/trunk/configure

@@ -631 +631 @@
 TCL_INC_SPEC
 STATSDIR
+RESOURCES_DIR
 EGREP
 GREP
@@ -4147 +4148 @@
 fi
 
+RESOURCES_DIR=${libdir}/resources
+
 
 

geovis/trunk/configure.ac

@@ -110 +110 @@
 fi
 
+RESOURCES_DIR=${libdir}/resources
+
 AC_CHECK_HEADERS([stdio.h unistd.h stdlib.h string.h sys/types.h])
 AC_CHECK_HEADERS([sys/socket.h sys/time.h netinet/in.h arpa/inet.h netdb.h])
@@ -115 +117 @@
 AC_CHECK_FUNCS([accept4])
 
+AC_SUBST(RESOURCES_DIR)
 AC_SUBST(STATSDIR)
 AC_SUBST(TCL_INC_SPEC)