Download as
Browse Code »

Commit a42aa8c7a1b94ed78583c7e8ad35d7a9ee7efc94

Authored by Perry Werneck
1 parent b1e611d3
Exists in master and in 3 other branches develop, macos, network_module

Fixing windows build.

Showing 6 changed files with 12 additions and 11 deletions   Show diff stats
@@ -92,7 +92,7 @@ case "$host" in @@ -92,7 +92,7 @@ case "$host" in
92 s390x-*) 92 s390x-*)
93 CFLAGS="$CFLAGS -pthread" 93 CFLAGS="$CFLAGS -pthread"
94 LDFLAGS="$LDFLAGS -pthread" 94 LDFLAGS="$LDFLAGS -pthread"
95 - app_cv_datadir="/usr/share" 95 + app_cv_datadir="/usr/share/pw3270"
96 app_cv_confdir="/etc" 96 app_cv_confdir="/etc"
97 app_cv_osname="linux" 97 app_cv_osname="linux"
98 LOGDIR="/var/log" 98 LOGDIR="/var/log"
@@ -101,7 +101,7 @@ case "$host" in @@ -101,7 +101,7 @@ case "$host" in
101 *) 101 *)
102 CFLAGS="$CFLAGS -pthread" 102 CFLAGS="$CFLAGS -pthread"
103 LDFLAGS="$LDFLAGS -pthread" 103 LDFLAGS="$LDFLAGS -pthread"
104 - app_cv_datadir="/usr/share" 104 + app_cv_datadir="/usr/share/pw3270"
105 app_cv_confdir="/etc" 105 app_cv_confdir="/etc"
106 app_cv_osname="linux" 106 app_cv_osname="linux"
107 LOGDIR="/var/log" 107 LOGDIR="/var/log"
@@ -109,7 +109,9 @@ case "$host" in @@ -109,7 +109,9 @@ case "$host" in
109 109
110 esac 110 esac
111 111
112 -AC_SUBST(DATADIR,$app_cv_datadir) 112 +AC_DEFINE_UNQUOTED(LIB3270_DATADIR,$app_cv_datadir)
  113 +AC_SUBST(LIB3270_DATADIR,$app_cv_datadir)
  114 +
113 AC_SUBST(CONFDIR,$app_cv_confdir) 115 AC_SUBST(CONFDIR,$app_cv_confdir)
114 AC_SUBST(OSNAME,$app_cv_osname) 116 AC_SUBST(OSNAME,$app_cv_osname)
115 AC_SUBST(LIBS) 117 AC_SUBST(LIBS)
src/include/config.h.in
  Diff comments   View file @a42aa8c
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
38 38
39 /* Defaults */ 39 /* Defaults */
40 #undef LIB3270_DEFAULT_HOST 40 #undef LIB3270_DEFAULT_HOST
  41 + #undef LIB3270_DATADIR
41 42
42 /* Libraries */ 43 /* Libraries */
43 #undef HAVE_GNUC_VISIBILITY 44 #undef HAVE_GNUC_VISIBILITY
src/include/lib3270.h
  Diff comments   View file @a42aa8c
@@ -1333,7 +1333,7 @@ @@ -1333,7 +1333,7 @@
1333 #endif // WIn32 1333 #endif // WIn32
1334 1334
1335 /** 1335 /**
1336 - * @brief Build filename on "DATADIR". 1336 + * @brief Build filename on "LIB3270_DATADIR".
1337 * 1337 *
1338 * @return Full path for the file (release it with lib3270_free). 1338 * @return Full path for the file (release it with lib3270_free).
1339 * 1339 *
src/lib3270/Makefile.in
  Diff comments   View file @a42aa8c
@@ -118,7 +118,6 @@ $(OBJDBG)/%.o: \ @@ -118,7 +118,6 @@ $(OBJDBG)/%.o: \
118 $(CFLAGS) \ 118 $(CFLAGS) \
119 -Wall -Wextra -fstack-check \ 119 -Wall -Wextra -fstack-check \
120 -DDEBUG=1 \ 120 -DDEBUG=1 \
121 - -DDATADIR=. \  
122 -o $@ -c $< 121 -o $@ -c $<
123 122
124 $(OBJDBG)/%.o: \ 123 $(OBJDBG)/%.o: \
@@ -139,7 +138,6 @@ $(OBJRLS)/%.o: \ @@ -139,7 +138,6 @@ $(OBJRLS)/%.o: \
139 @$(CC) \ 138 @$(CC) \
140 $(CFLAGS) \ 139 $(CFLAGS) \
141 -DNDEBUG=1 \ 140 -DNDEBUG=1 \
142 - -DDATADIR=$(datarootdir)/pw3270 \  
143 -o $@ -c $< 141 -o $@ -c $<
144 142
145 $(OBJRLS)/%.o: \ 143 $(OBJRLS)/%.o: \
src/lib3270/linux/util.c
  Diff comments   View file @a42aa8c
@@ -38,5 +38,5 @@ @@ -38,5 +38,5 @@
38 38
39 char * lib3270_build_data_filename(const char *name) 39 char * lib3270_build_data_filename(const char *name)
40 { 40 {
41 - return lib3270_strdup_printf("%s/%s",LIB3270_STRINGIZE_VALUE_OF(DATADIR),name); 41 + return lib3270_strdup_printf("%s/%s",LIB3270_STRINGIZE_VALUE_OF(LIB3270_DATADIR),name);
42 } 42 }
src/lib3270/windows/util.c
  Diff comments   View file @a42aa8c
@@ -213,15 +213,15 @@ char * lib3270_build_data_filename(const char *name) @@ -213,15 +213,15 @@ char * lib3270_build_data_filename(const char *name)
213 // https://github.com/GNOME/glib/blob/master/glib/gwin32.c 213 // https://github.com/GNOME/glib/blob/master/glib/gwin32.c
214 214
215 char *p; 215 char *p;
216 - wchar_t wc_fn[MAX_PATH]; 216 + char wc_fn[MAX_PATH];
217 217
218 - if (!GetModuleFileNameW(NULL, wc_fn, MAX_PATH)) 218 + if (!GetModuleFileName(NULL, wc_fn, MAX_PATH))
219 return NULL; 219 return NULL;
220 220
221 - if((p = strrchr (filename, '\')) != NULL) 221 + if((p = strrchr(wc_fn, '\')) != NULL)
222 *p = '\0'; 222 *p = '\0';
223 223
224 - if((p = strrchr (filename, '/')) != NULL) 224 + if((p = strrchr(wc_fn, '/')) != NULL)
225 *p = '\0'; 225 *p = '\0';
226 226
227 return lib3270_strdup_printf("%s\\%s",wc_fn,name); 227 return lib3270_strdup_printf("%s\\%s",wc_fn,name);