Commit fe3154fe8908b53ec477dfe873243274b3fc9e2f
1 parent
7ee2d8ee
Exists in
master
and in
3 other branches
Ajustes para uso como módulo do projeto principal.
Showing
2 changed files
with
6 additions
and
6 deletions
Show diff stats
Makefile.in
@@ -53,9 +53,9 @@ sysconfdir=@sysconfdir@ | @@ -53,9 +53,9 @@ sysconfdir=@sysconfdir@ | ||
53 | 53 | ||
54 | BASEDIR=@BASEDIR@ | 54 | BASEDIR=@BASEDIR@ |
55 | 55 | ||
56 | -POTDIR=$(BASEDIR)/.pot | 56 | +POTDIR=$(BASEDIR)/lib@LIB3270_NAME@/.pot |
57 | 57 | ||
58 | -OBJDIR=$(BASEDIR)/.obj | 58 | +OBJDIR=$(BASEDIR)/.obj/lib@LIB3270_NAME@ |
59 | OBJDBG=$(OBJDIR)/Debug | 59 | OBJDBG=$(OBJDIR)/Debug |
60 | OBJRLS=$(OBJDIR)/Release | 60 | OBJRLS=$(OBJDIR)/Release |
61 | 61 |
configure.ac
@@ -63,7 +63,6 @@ dnl --------------------------------------------------------------------------- | @@ -63,7 +63,6 @@ dnl --------------------------------------------------------------------------- | ||
63 | 63 | ||
64 | DBG_CFLAGS="-g -fstack-check -DDEBUG=1" | 64 | DBG_CFLAGS="-g -fstack-check -DDEBUG=1" |
65 | RLS_CFLAGS="-DNDEBUG=1" | 65 | RLS_CFLAGS="-DNDEBUG=1" |
66 | -PLUGINS="" | ||
67 | APP_RESOURCES="" | 66 | APP_RESOURCES="" |
68 | APP_LDFLAGS="" | 67 | APP_LDFLAGS="" |
69 | DLL_LDFLAGS="-shared" | 68 | DLL_LDFLAGS="-shared" |
@@ -435,12 +434,13 @@ fi | @@ -435,12 +434,13 @@ fi | ||
435 | 434 | ||
436 | AC_SUBST(LDAP_LIBS) | 435 | AC_SUBST(LDAP_LIBS) |
437 | 436 | ||
437 | + | ||
438 | dnl --------------------------------------------------------------------------- | 438 | dnl --------------------------------------------------------------------------- |
439 | -dnl Output config | 439 | +dnl Directory config |
440 | dnl --------------------------------------------------------------------------- | 440 | dnl --------------------------------------------------------------------------- |
441 | 441 | ||
442 | -AC_SUBST(BASEDIR,$ac_pwd) | ||
443 | -AC_SUBST(PLUGINS) | 442 | +AC_ARG_WITH([work-dir], [AS_HELP_STRING([--with-work-dir], [Setup work path])], [ app_cv_workdir="$withval" ],[ app_cv_workdir="$ac_pwd" ]) |
443 | +AC_SUBST(BASEDIR,$app_cv_workdir) | ||
444 | 444 | ||
445 | dnl --------------------------------------------------------------------------- | 445 | dnl --------------------------------------------------------------------------- |
446 | dnl Configure which files to generate. | 446 | dnl Configure which files to generate. |