1
0
Fork 0

fixed arango-password with configure option --enable-relative=devel

This commit is contained in:
Jan Steemann 2012-07-26 11:03:07 +02:00
parent 7036501641
commit ac82f4b7eb
4 changed files with 38 additions and 6 deletions

View File

@ -307,12 +307,21 @@ built-sources: build.h errorfiles $(JAVASCRIPT_HEADER)
################################################################################
bin/arango-password: bin/arango-password.in
if ENABLE_RELATIVE_DEVEL
sed \
-e 's%@SBINDIR@%bin%g' \
-e 's%@DATABASE@%${databasedir}%g' \
-e 's%@STATICFILES@%${pkgdatadir}%g' \
$< > $@
chmod 755 $@
else
sed \
-e 's%@SBINDIR@%${DESTDIR}${sbindir}%g' \
-e 's%@DATABASE@%${databasedir}%g' \
-e 's%@STATICFILES@%${pkgdatadir}%g' \
$< > $@
chmod 755 $@
endif
CLEANUP += bin/arango-password

View File

@ -5490,12 +5490,18 @@ built-sources: build.h errorfiles $(JAVASCRIPT_HEADER)
################################################################################
bin/arango-password: bin/arango-password.in
sed \
-e 's%@SBINDIR@%${DESTDIR}${sbindir}%g' \
-e 's%@DATABASE@%${databasedir}%g' \
-e 's%@STATICFILES@%${pkgdatadir}%g' \
$< > $@
chmod 755 $@
@ENABLE_RELATIVE_DEVEL_TRUE@ sed \
@ENABLE_RELATIVE_DEVEL_TRUE@ -e 's%@SBINDIR@%bin%g' \
@ENABLE_RELATIVE_DEVEL_TRUE@ -e 's%@DATABASE@%${databasedir}%g' \
@ENABLE_RELATIVE_DEVEL_TRUE@ -e 's%@STATICFILES@%${pkgdatadir}%g' \
@ENABLE_RELATIVE_DEVEL_TRUE@ $< > $@
@ENABLE_RELATIVE_DEVEL_TRUE@ chmod 755 $@
@ENABLE_RELATIVE_DEVEL_FALSE@ sed \
@ENABLE_RELATIVE_DEVEL_FALSE@ -e 's%@SBINDIR@%${DESTDIR}${sbindir}%g' \
@ENABLE_RELATIVE_DEVEL_FALSE@ -e 's%@DATABASE@%${databasedir}%g' \
@ENABLE_RELATIVE_DEVEL_FALSE@ -e 's%@STATICFILES@%${pkgdatadir}%g' \
@ENABLE_RELATIVE_DEVEL_FALSE@ $< > $@
@ENABLE_RELATIVE_DEVEL_FALSE@ chmod 755 $@
@ENABLE_MRUBY_TRUE@.setup-mr-directories:
@ENABLE_MRUBY_TRUE@ @test -d mr || mkdir mr

15
configure vendored
View File

@ -752,6 +752,8 @@ build_os
build_vendor
build_cpu
build
ENABLE_RELATIVE_DEVEL_FALSE
ENABLE_RELATIVE_DEVEL_TRUE
ENABLE_INSTALL_DBDIR_FALSE
ENABLE_INSTALL_DBDIR_TRUE
ENABLE_BOOST_TEST_FALSE
@ -2643,6 +2645,15 @@ else
fi
fi
if test "x$tr_RELATIVE" = xdevel; then
ENABLE_RELATIVE_DEVEL_TRUE=
ENABLE_RELATIVE_DEVEL_FALSE='#'
else
ENABLE_RELATIVE_DEVEL_TRUE='#'
ENABLE_RELATIVE_DEVEL_FALSE=
fi
@ -9725,6 +9736,10 @@ if test -z "${ENABLE_INSTALL_DBDIR_TRUE}" && test -z "${ENABLE_INSTALL_DBDIR_FAL
as_fn_error $? "conditional \"ENABLE_INSTALL_DBDIR\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_RELATIVE_DEVEL_TRUE}" && test -z "${ENABLE_RELATIVE_DEVEL_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_RELATIVE_DEVEL\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_DARWIN_TRUE}" && test -z "${ENABLE_DARWIN_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_DARWIN\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5

View File

@ -130,6 +130,8 @@ else
fi
fi
AM_CONDITIONAL(ENABLE_RELATIVE_DEVEL, test "x$tr_RELATIVE" = xdevel)
dnl ============================================================================
dnl --SECTION-- CONFIGURATION
dnl ============================================================================