Download as
Browse Code »

Commit 8fc746da703bb887539c864eca0e6cc4c28bd828

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

Fixing "deb" builds.

Showing 1 changed file with 11 additions and 9 deletions   Show diff stats
@@ -250,11 +250,11 @@ $(BINRLS)/$(LIBNAME).a: \ @@ -250,11 +250,11 @@ $(BINRLS)/$(LIBNAME).a: \
250 250
251 install: \ 251 install: \
252 locale/$(PACKAGE_NAME).pot \ 252 locale/$(PACKAGE_NAME).pot \
253 - $(foreach PKG, $(INSTALL_PACKAGES), install-$(PKG)) \  
254 - install-locale 253 + $(foreach PKG, $(INSTALL_PACKAGES), install-$(PKG))
255 254
256 install-linux-lib: \ 255 install-linux-lib: \
257 - $(BINRLS)/$(SONAME) 256 + $(BINRLS)/$(SONAME) \
  257 + install-locale
258 258
259 # Install library 259 # Install library
260 @$(MKDIR) $(DESTDIR)$(libdir) 260 @$(MKDIR) $(DESTDIR)$(libdir)
@@ -263,17 +263,13 @@ install-linux-lib: \ @@ -263,17 +263,13 @@ install-linux-lib: \
263 $(BINRLS)/$(SONAME) \ 263 $(BINRLS)/$(SONAME) \
264 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ 264 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
265 265
266 - @rm -f $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@  
267 - @$(LN_S) \  
268 - $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \  
269 - $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@  
270 -  
271 # Install default configs 266 # Install default configs
272 @mkdir -p $(DESTDIR)$(datarootdir)/pw3270 267 @mkdir -p $(DESTDIR)$(datarootdir)/pw3270
273 268
274 install-windows-lib: \ 269 install-windows-lib: \
275 $(BINRLS)/$(SONAME) \ 270 $(BINRLS)/$(SONAME) \
276 - $(BINRLS)/$(LIBNAME).dll.a 271 + $(BINRLS)/$(LIBNAME).dll.a \
  272 + install-locale
277 273
278 @$(MKDIR) \ 274 @$(MKDIR) \
279 $(DESTDIR)$(bindir) 275 $(DESTDIR)$(bindir)
@@ -356,6 +352,12 @@ install-dev: \ @@ -356,6 +352,12 @@ install-dev: \
356 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot 352 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot
357 @$(INSTALL_DATA) locale/$(PACKAGE_NAME).pot $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot 353 @$(INSTALL_DATA) locale/$(PACKAGE_NAME).pot $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot
358 354
  355 + @rm -f $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@
  356 + @$(LN_S) \
  357 + $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
  358 + $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@
  359 +
  360 +
359 #---[ Misc Targets ]--------------------------------------------------------------------- 361 #---[ Misc Targets ]---------------------------------------------------------------------
360 362
361 $(BASEDIR)/.tmp/$(LIBNAME)/fallbacks.c: \ 363 $(BASEDIR)/.tmp/$(LIBNAME)/fallbacks.c: \