Skip to content

Commit

Permalink
fix distcheck about caja_extension_dir
Browse files Browse the repository at this point in the history
  • Loading branch information
yetist authored and raveit65 committed Feb 18, 2019
1 parent dd70319 commit 6d281bc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
8 changes: 7 additions & 1 deletion configure.ac
Expand Up @@ -79,14 +79,20 @@ AC_ARG_WITH(caja-extension-dir,
AC_MSG_CHECKING([for caja extension directory])
if test -n "$with_caja_extension_dir"; then
CAJA_EXTENSION_DIR=$with_caja_extension_dir
custom_caja_extension_dir=true
else
CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
CAJA_EXTENSION_DIR=${CAJA_EXTENSION_DIR#`$PKG_CONFIG --variable=libdir libcaja-extension`}
CAJA_EXTENSION_DIR=${CAJA_EXTENSION_DIR#/}
custom_caja_extension_dir=false
fi
if test -z "$CAJA_EXTENSION_DIR"; then
CAJA_EXTENSION_DIR='${exec_prefix}/lib/caja/extensions-2.0'
CAJA_EXTENSION_DIR='caja/extensions-2.0'
custom_caja_extension_dir=false
fi

AC_MSG_RESULT([${CAJA_EXTENSION_DIR}])
AM_CONDITIONAL([CUSTOM_CAJA_EXTENSION_DIR], [test x$custom_caja_extension_dir = xtrue])
AC_SUBST(CAJA_EXTENSION_DIR)

CAJA_VERSION=`$PKG_CONFIG --modversion libcaja-extension`
Expand Down
4 changes: 4 additions & 0 deletions src/Makefile.am
Expand Up @@ -2,7 +2,11 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir)

if CUSTOM_CAJA_EXTENSION_DIR
caja_extensiondir=$(CAJA_EXTENSION_DIR)
else
caja_extensiondir=$(libdir)/$(CAJA_EXTENSION_DIR)
endif

caja_extension_LTLIBRARIES=libcaja-dropbox.la

Expand Down

0 comments on commit 6d281bc

Please sign in to comment.