Changeset 4484

Timestamp:

07/06/06 06:36:22 (2 years ago)

Author:

erijo

Message:

This makes Licq look for plugins in $libdir/licq and shared data in
$datadir/licq. Both libdir and datadir can be passed as arguments to
configure. Replaces the old behavior where plugins were installed to
$prefix/lib/licq and shared data to $prefix/share/licq. Plugins will have to
be updated to use $libdir/licq. Will commit qt-gui and msn updates shortly.

Please test this with your setup! (don't forget make -f Makefile.cvs)

Closes #622.

Location:

trunk/licq

Files:

• configure.in (modified) (1 diff)
• include/licq_constants.h (modified) (1 diff)
• src/licq.cpp (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)

trunk/licq/configure.in

@@ -16 +16 @@
 AC_DEFINE_UNQUOTED(INT_VERSION,$INT_VERSION, [Licq version number as int])
 AC_DEFINE_UNQUOTED(USE_FIFO, 1, [Undefine if it causes problems]) 
+
+
+dnl Expand prefix and exec_prefix
+test "x${prefix}" = "xNONE" && prefix="${ac_default_prefix}"
+test "x${exec_prefix}" = "xNONE" && exec_prefix='${prefix}'
+
+dnl (May) need to expand libdir and datadir more than once:
+dnl $libdir => $exec_prefix/lib => $prefix/lib => /some/path/lib
+install_libdir=$(eval "echo \"$(eval "echo \"${libdir}\"")\"")
+AC_DEFINE_UNQUOTED(INSTALL_LIBDIR, "${install_libdir}/licq/", [Directory where plugins go])
+
+dnl $datadir => $datarootdir => $prefix/share => /some/path/share
+install_datadir=$(eval "echo \"$(eval "echo \"${datadir}\"")\"")
+AC_DEFINE_UNQUOTED(INSTALL_SHAREDIR, "${install_datadir}/licq/", [Directory where shared data go])
+
 
 AC_ARG_ENABLE(

trunk/licq/include/licq_constants.h

@@ -5 +5 @@
 // Directory constants
 const char DEFAULT_HOME_DIR[]                      = ".licq";
-const char BASE_SHARE_DIR[]                        = "share/licq/";
-const char BASE_LIB_DIR[]                          = "lib/licq/";
 const char USER_DIR[]                              = "users";
 const char HISTORY_DIR[]                           = "history";

trunk/licq/src/licq.cpp

@@ -298 +298 @@
 
   // Define the directory for all the shared data
-  sprintf(SHARE_DIR, "%s/%s", INSTALL_PREFIX, BASE_SHARE_DIR);
-  sprintf(LIB_DIR, "%s/%s", INSTALL_PREFIX, BASE_LIB_DIR);
+  strncpy(SHARE_DIR, INSTALL_SHAREDIR, MAX_FILENAME_LEN);
+  SHARE_DIR[MAX_FILENAME_LEN - 1] = '\0';
+
+  strncpy(LIB_DIR, INSTALL_LIBDIR, MAX_FILENAME_LEN);
+  LIB_DIR[MAX_FILENAME_LEN - 1] = '\0';
+
 
   // Check pid

trunk/licq/src/Makefile.am

@@ -1 @@
-AM_CPPFLAGS = -Wall -I$(top_srcdir)/include -DINSTALL_PREFIX=\"@prefix@\" @SOCKS_INCDIR@
+AM_CPPFLAGS = -Wall -I$(top_srcdir)/include @SOCKS_INCDIR@
 
 datadir = @datadir@
@@ -19 +19 @@
      icqd-chat.cpp sighandler.c icqd-filetransfer.cpp \
      hebrev.c icqcolor.cpp fifo.cpp  protoplugind.cpp gpg.cpp \
-         occupationcodes.c homepagecodes.c interestcodes.c \
-         organizationcodes.c backgroundcodes.c providers.c rtf.cc
+     occupationcodes.c homepagecodes.c interestcodes.c \
+     organizationcodes.c backgroundcodes.c providers.c rtf.cc
 
 licq_LDADD = @SOCKS_LIBS@