Download as
Browse Code »

Commit c5bc938230c7326b72bec0457b830b63feea98da

Authored by Perry Werneck
1 parent dfc34cc0
Exists in master and in 1 other branch develop

Fixing windows build.

Showing 3 changed files with 6 additions and 14 deletions   Show diff stats
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
28 28
29 SONAME=@SONAME@ 29 SONAME=@SONAME@
30 LIBNAME=libv3270 30 LIBNAME=libv3270
  31 +PRODUCT_NAME=@PRODUCT_NAME@
31 32
32 SOURCES= \ 33 SOURCES= \
33 $(wildcard src/terminal/*.c) \ 34 $(wildcard src/terminal/*.c) \
@@ -77,8 +78,6 @@ datarootdir=@datarootdir@ @@ -77,8 +78,6 @@ datarootdir=@datarootdir@
77 localedir=@localedir@ 78 localedir=@localedir@
78 docdir=@docdir@ 79 docdir=@docdir@
79 sysconfdir=@sysconfdir@ 80 sysconfdir=@sysconfdir@
80 -datadir=$(datarootdir)/@PRODUCT_NAME@  
81 -confdir=$(sysconfdir)/@PRODUCT_NAME@  
82 81
83 BASEDIR=@BASEDIR@ 82 BASEDIR=@BASEDIR@
84 83
@@ -298,11 +297,11 @@ install-shared: \ @@ -298,11 +297,11 @@ install-shared: \
298 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@ 297 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@
299 298
300 # Install default configs 299 # Install default configs
301 - @mkdir -p $(DESTDIR)$(datadir) 300 + @mkdir -p $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)
302 301
303 @$(INSTALL_DATA) \ 302 @$(INSTALL_DATA) \
304 conf/colors.conf \ 303 conf/colors.conf \
305 - $(DESTDIR)$(datadir)/colors.conf 304 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/colors.conf
306 305
307 install-static: \ 306 install-static: \
308 $(BINRLS)/static/$(LIBNAME).a 307 $(BINRLS)/static/$(LIBNAME).a
@@ -332,8 +331,8 @@ install-dev: \ @@ -332,8 +331,8 @@ install-dev: \
332 $(DESTDIR)$(libdir)/pkgconfig/libv3270.pc 331 $(DESTDIR)$(libdir)/pkgconfig/libv3270.pc
333 332
334 # Install translation files 333 # Install translation files
335 - @$(MKDIR) $(DESTDIR)$(datadir)/pot  
336 - @$(INSTALL_DATA) $(POTDIR)/$(LIBNAME).pot $(DESTDIR)$(datadir)/pot/$(LIBNAME).pot 334 + @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot
  335 + @$(INSTALL_DATA) $(POTDIR)/$(LIBNAME).pot $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot/$(LIBNAME).pot
337 336
338 install-glade: 337 install-glade:
339 338
@@ -101,8 +101,6 @@ case "$host" in @@ -101,8 +101,6 @@ case "$host" in
101 s390x-*) 101 s390x-*)
102 CFLAGS="$CFLAGS -pthread" 102 CFLAGS="$CFLAGS -pthread"
103 LDFLAGS="$LDFLAGS -pthread" 103 LDFLAGS="$LDFLAGS -pthread"
104 - app_cv_datadir="/usr/share"  
105 - app_cv_confdir="/etc"  
106 app_cv_osname="linux" 104 app_cv_osname="linux"
107 LOGDIR="/var/log" 105 LOGDIR="/var/log"
108 ;; 106 ;;
@@ -110,17 +108,12 @@ case "$host" in @@ -110,17 +108,12 @@ case "$host" in
110 *) 108 *)
111 CFLAGS="$CFLAGS -pthread" 109 CFLAGS="$CFLAGS -pthread"
112 LDFLAGS="$LDFLAGS -pthread" 110 LDFLAGS="$LDFLAGS -pthread"
113 - app_cv_datadir="/usr/share"  
114 - app_cv_confdir="/etc"  
115 app_cv_osname="linux" 111 app_cv_osname="linux"
116 LOGDIR="/var/log" 112 LOGDIR="/var/log"
117 DLLEXT=".so" 113 DLLEXT=".so"
118 114
119 esac 115 esac
120 116
121 -  
122 -AC_SUBST(DATADIR,$app_cv_datadir)  
123 -AC_SUBST(CONFDIR,$app_cv_confdir)  
124 AC_SUBST(OSNAME,$app_cv_osname) 117 AC_SUBST(OSNAME,$app_cv_osname)
125 AC_SUBST(LIBS) 118 AC_SUBST(LIBS)
126 AC_SUBST(LOGDIR) 119 AC_SUBST(LOGDIR)
sdk/libv3270.pc.in
  Diff comments   View file @c5bc938
@@ -9,7 +9,7 @@ version_minor=@PACKAGE_MINOR_VERSION@ @@ -9,7 +9,7 @@ version_minor=@PACKAGE_MINOR_VERSION@
9 Name: @PACKAGE_NAME@ 9 Name: @PACKAGE_NAME@
10 Description: @PACKAGE_DESCRIPTION@ 10 Description: @PACKAGE_DESCRIPTION@
11 Version: @PACKAGE_VERSION@ 11 Version: @PACKAGE_VERSION@
12 -Libs: -L\@libdir@ -lv3270 12 +Libs: -lv3270
13 Libs.private: @LIBS@ @GTK_LIBS@ @GLIB_LIBS@ @LIBICONV@ @INTL_LIBS@ @LIB3270_LIBS@ 13 Libs.private: @LIBS@ @GTK_LIBS@ @GLIB_LIBS@ @LIBICONV@ @INTL_LIBS@ @LIB3270_LIBS@
14 Cflags: -I@includedir@ 14 Cflags: -I@includedir@
15 15