Download as
Browse Code »

Commit 8461e6a916107ea9805db51683d492ec7ff9e4d9

Authored by Perry Werneck
1 parent 4dbe524a
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Updates for customized windows build.

Showing 2 changed files with 11 additions and 7 deletions   Show diff stats
configure.ac
  Diff comments   View file @8461e6a
... ... @@ -497,10 +497,16 @@ AC_SUBST(LIBSSL_CFLAGS)
497 497 AC_SEARCH_LIBS([dlopen], [dl], AC_DEFINE(HAVE_LIBDL), AC_MSG_NOTICE([libdl not present.]))
498 498  
499 499 dnl ---------------------------------------------------------------------------
  500 +dnl Directory config
  501 +dnl ---------------------------------------------------------------------------
  502 +
  503 +AC_ARG_WITH([build-dir], [AS_HELP_STRING([--with-build-dir], [Setup build path])], [ app_cv_buildir="$withval" ],[ app_cv_buildir="$ac_pwd" ])
  504 +AC_SUBST(BASEDIR,$app_cv_buildir)
  505 +
  506 +dnl ---------------------------------------------------------------------------
500 507 dnl Output config
501 508 dnl ---------------------------------------------------------------------------
502 509  
503   -AC_SUBST(BASEDIR,$ac_pwd)
504 510 AC_SUBST(PLUGINS)
505 511  
506 512 dnl ---------------------------------------------------------------------------
... ...
win/makeruntime.sh.in
  Diff comments   View file @8461e6a
... ... @@ -25,8 +25,6 @@
25 25 # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
26 26 #
27 27  
28   -myDIR=$(dirname $(readlink -f $0))
29   -
30 28 prefix="@prefix@"
31 29 PKG_CONFIG="@PKG_CONFIG@"
32 30 GTK_VERSION="gtk+-@GTK_VERSION@"
... ... @@ -34,7 +32,7 @@ GTK_VERSION="gtk+-@GTK_VERSION@"
34 32 GTK_PREFIX=$($PKG_CONFIG --variable=prefix ${GTK_VERSION})
35 33 GDK_LOADERS=$(${PKG_CONFIG} --variable=gdk_pixbuf_binarydir gdk-pixbuf-2.0 | sed -e "s@${prefix}@@g")
36 34  
37   -TARGET="$(dirname ${myDIR})/.bin/runtime"
  35 +TARGET="@BASEDIR@/.bin/runtime"
38 36  
39 37 # Change to bin path
40 38 mkdir -p ${TARGET}
... ... @@ -48,8 +46,8 @@ copy_dll() {
48 46 SOURCES=$(mktemp)
49 47 REQUIRES=$(mktemp)
50 48  
51   - find "$(dirname ${myDIR})/.bin/Release/" -iname "*.dll" > ${SOURCES}
52   - find "$(dirname ${myDIR})/.bin/Release/" -iname "*.exe" >> ${SOURCES}
  49 + find "@BASEDIR@/.bin/Release/" -iname "*.dll" > ${SOURCES}
  50 + find "@BASEDIR@/.bin/Release/" -iname "*.exe" >> ${SOURCES}
53 51 find "${TARGET}" -iname *.dll >> ${SOURCES}
54 52  
55 53 while read FILENAME
... ... @@ -120,7 +118,7 @@ copy_dll() {
120 118 do
121 119 if [ ! -e "${TARGET}/${FILENAME}" ]; then
122 120  
123   - COUNT=$(find "$(dirname ${myDIR})/.bin/Release/" -iname ${FILENAME} | wc --lines)
  121 + COUNT=$(find "@BASEDIR@/.bin/Release/" -iname ${FILENAME} | wc --lines)
124 122 if [ "${COUNT}" == "0" ]; then
125 123  
126 124 echo ${FILENAME}
... ...