Changeset 6514

Timestamp:

Aug 14, 2008, 10:35:11 AM (13 years ago)

Author:

muks

Message:

Respect non-standard install paths for web interface files

Location:

trunk/libtransmission

Files:

• Makefile.am (modified) (1 diff)
• platform.c (modified) (1 diff)

trunk/libtransmission/Makefile.am

@@ -1 @@
-AM_CPPFLAGS = -I. -I$(top_srcdir) -I$(top_srcdir)/third-party/ -D__TRANSMISSION__ $(LIBEVENT_CPPFLAGS)
+AM_CPPFLAGS = \
+        -I. -I$(top_srcdir) -I$(top_srcdir)/third-party/ \
+        -D__TRANSMISSION__ $(LIBEVENT_CPPFLAGS) \
+        -DPACKAGE_DATA_DIR=\""$(datadir)"\"
+
 AM_CFLAGS = $(LIBCURL_CFLAGS) $(OPENSSL_CFLAGS) $(PTHREAD_CFLAGS)
 

trunk/libtransmission/platform.c

@@ -564 +564 @@
             s = getenv( "XDG_DATA_DIRS" );
             if( !s || !*s )
-                s = "/usr/local/share/:/usr/share/";
+                s =  PACKAGE_DATA_DIR ":/usr/local/share/:/usr/share/";
             while( s && *s ) {
                 char * end = strchr( s, ':' );