Skip to content

Commit 6d281bc

Browse files
yetistraveit65
authored andcommitted
fix distcheck about caja_extension_dir
1 parent dd70319 commit 6d281bc

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

‎configure.ac‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,20 @@ AC_ARG_WITH(caja-extension-dir,
7979
AC_MSG_CHECKING([for caja extension directory])
8080
if test -n "$with_caja_extension_dir"; then
8181
CAJA_EXTENSION_DIR=$with_caja_extension_dir
82+
custom_caja_extension_dir=true
8283
else
8384
CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
85+
CAJA_EXTENSION_DIR=${CAJA_EXTENSION_DIR#`$PKG_CONFIG --variable=libdir libcaja-extension`}
86+
CAJA_EXTENSION_DIR=${CAJA_EXTENSION_DIR#/}
87+
custom_caja_extension_dir=false
8488
fi
8589
if test -z "$CAJA_EXTENSION_DIR"; then
86-
CAJA_EXTENSION_DIR='${exec_prefix}/lib/caja/extensions-2.0'
90+
CAJA_EXTENSION_DIR='caja/extensions-2.0'
91+
custom_caja_extension_dir=false
8792
fi
8893

8994
AC_MSG_RESULT([${CAJA_EXTENSION_DIR}])
95+
AM_CONDITIONAL([CUSTOM_CAJA_EXTENSION_DIR], [test x$custom_caja_extension_dir = xtrue])
9096
AC_SUBST(CAJA_EXTENSION_DIR)
9197

9298
CAJA_VERSION=`$PKG_CONFIG --modversion libcaja-extension`

‎src/Makefile.am‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ AM_CPPFLAGS = \
22
-I$(top_srcdir) \
33
-I$(top_builddir)
44

5+
if CUSTOM_CAJA_EXTENSION_DIR
56
caja_extensiondir=$(CAJA_EXTENSION_DIR)
7+
else
8+
caja_extensiondir=$(libdir)/$(CAJA_EXTENSION_DIR)
9+
endif
610

711
caja_extension_LTLIBRARIES=libcaja-dropbox.la
812

0 commit comments

Comments
 (0)