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