Download as
Browse Code »

Commit 88cd19d9212d08686ecab04b1d0afecd8cfbf162

Authored by Perry Werneck
2 parents fad2918a 98158138
Exists in master and in 1 other branch develop

Merge branch 'master' into develop

Showing 1 changed file with 27 additions and 17 deletions   Show diff stats
Makefile.in
  Diff comments   View file @88cd19d
... ... @@ -339,7 +339,6 @@ install-linux-lib: \
339 339  
340 340 install-windows-lib: \
341 341 $(BINRLS)/$(SONAME) \
342   - $(BINRLS)/$(LIBNAME).dll.a \
343 342 install-conf \
344 343 install-locale
345 344  
... ... @@ -350,20 +349,6 @@ install-windows-lib: \
350 349 $(BINRLS)/$(SONAME) \
351 350 $(DESTDIR)$(bindir)/$(SONAME)
352 351  
353   - @$(MKDIR) \
354   - $(DESTDIR)$(libdir)
355   -
356   - @$(INSTALL_DATA) \
357   - $(BINRLS)/$(LIBNAME).dll.a \
358   - $(DESTDIR)$(libdir)
359   -
360   - @$(MKDIR) \
361   - $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
362   -
363   - @$(INSTALL_DATA) \
364   - $(BINRLS)/$(LIBNAME).def \
365   - $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
366   -
367 352 install-static: \
368 353 $(BINRLS)/static/$(LIBNAME).a
369 354  
... ... @@ -390,9 +375,9 @@ install-conf:
390 375 conf/colors.conf \
391 376 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/colors.conf
392 377  
393   -
394 378 install-dev: \
395   - locale/$(LIBNAME).pot
  379 + locale/$(LIBNAME).pot \
  380 + install-@OSNAME@-dev
396 381  
397 382 @mkdir -p $(DESTDIR)$(includedir)/v3270
398 383  
... ... @@ -414,10 +399,35 @@ install-dev: \
414 399 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot
415 400 @$(INSTALL_DATA) locale/$(LIBNAME).pot $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot
416 401  
  402 +
  403 +install-linux-dev:
  404 +
  405 + @$(MKDIR) \
  406 + $(DESTDIR)$(libdir)
  407 +
417 408 @$(LN_S) \
418 409 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
419 410 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@
420 411  
  412 +install-windows-dev: \
  413 + $(BINRLS)/$(SONAME) \
  414 + $(BINRLS)/$(LIBNAME).dll.a
  415 +
  416 + @$(MKDIR) \
  417 + $(DESTDIR)$(libdir)
  418 +
  419 + @$(INSTALL_DATA) \
  420 + $(BINRLS)/$(LIBNAME).dll.a \
  421 + $(DESTDIR)$(libdir)
  422 +
  423 + @$(MKDIR) \
  424 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
  425 +
  426 + @$(INSTALL_DATA) \
  427 + $(BINRLS)/$(LIBNAME).def \
  428 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
  429 +
  430 +
421 431 install-glade:
422 432  
423 433 @mkdir -p $(DESTDIR)$(datarootdir)/glade/catalogs
... ...