Download as
Browse Code »

Commit dac07f8eebfe1da076ab1920f70995db73bf2951

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

Fixing windows build.

Showing 1 changed file with 41 additions and 35 deletions   Show diff stats
@@ -309,7 +309,8 @@ install: \ @@ -309,7 +309,8 @@ install: \
309 $(foreach PKG, $(INSTALL_PACKAGES), install-$(PKG)) 309 $(foreach PKG, $(INSTALL_PACKAGES), install-$(PKG))
310 310
311 install-linux-lib: \ 311 install-linux-lib: \
312 - $(BINRLS)/$(SONAME) 312 + $(BINRLS)/$(SONAME) \
  313 + install-conf
313 314
314 # Install library 315 # Install library
315 @$(MKDIR) $(DESTDIR)$(libdir) 316 @$(MKDIR) $(DESTDIR)$(libdir)
@@ -326,20 +327,31 @@ install-linux-lib: \ @@ -326,20 +327,31 @@ install-linux-lib: \
326 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \ 327 $(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \
327 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@ 328 $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@
328 329
329 - # Install remaps  
330 - @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/remap 330 +install-windows-lib: \
  331 + $(BINRLS)/$(SONAME) \
  332 + $(BINRLS)/$(LIBNAME).dll.a \
  333 + install-conf
331 334
332 - @$(INSTALL_DATA) \  
333 - remap/*.xml \  
334 - $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/remap 335 + @$(MKDIR) \
  336 + $(DESTDIR)$(bindir)
335 337
336 - # Install default configs  
337 - @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME) 338 + @$(INSTALL_PROGRAM) \
  339 + $(BINRLS)/$(SONAME) \
  340 + $(DESTDIR)$(bindir)/$(SONAME)
  341 +
  342 + @$(MKDIR) \
  343 + $(DESTDIR)$(libdir)
338 344
339 @$(INSTALL_DATA) \ 345 @$(INSTALL_DATA) \
340 - conf/colors.conf \  
341 - $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/colors.conf 346 + $(BINRLS)/$(LIBNAME).dll.a \
  347 + $(DESTDIR)$(libdir)
342 348
  349 + @$(MKDIR) \
  350 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
  351 +
  352 + @$(INSTALL_DATA) \
  353 + $(BINRLS)/$(LIBNAME).def \
  354 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
343 355
344 install-static: \ 356 install-static: \
345 $(BINRLS)/static/$(LIBNAME).a 357 $(BINRLS)/static/$(LIBNAME).a
@@ -349,6 +361,25 @@ install-static: \ @@ -349,6 +361,25 @@ install-static: \
349 $(BINRLS)/static/$(LIBNAME).a \ 361 $(BINRLS)/static/$(LIBNAME).a \
350 $(DESTDIR)$(libdir)/$(LIBNAME)-static.a 362 $(DESTDIR)$(libdir)/$(LIBNAME)-static.a
351 363
  364 +install-conf:
  365 +
  366 + # Install remaps
  367 + @$(MKDIR) \
  368 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/remap
  369 +
  370 + @$(INSTALL_DATA) \
  371 + remap/*.xml \
  372 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/remap
  373 +
  374 + # Install default configs
  375 + @$(MKDIR) \
  376 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)
  377 +
  378 + @$(INSTALL_DATA) \
  379 + conf/colors.conf \
  380 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/colors.conf
  381 +
  382 +
352 install-dev: \ 383 install-dev: \
353 $(POTDIR)/$(LIBNAME).pot 384 $(POTDIR)/$(LIBNAME).pot
354 385
@@ -372,31 +403,6 @@ install-dev: \ @@ -372,31 +403,6 @@ install-dev: \
372 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot 403 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot
373 @$(INSTALL_DATA) $(POTDIR)/$(LIBNAME).pot $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot/$(LIBNAME).pot 404 @$(INSTALL_DATA) $(POTDIR)/$(LIBNAME).pot $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot/$(LIBNAME).pot
374 405
375 -install-windows-lib: \  
376 - $(BINRLS)/$(SONAME) \  
377 - $(BINRLS)/$(LIBNAME).dll.a  
378 -  
379 - @$(MKDIR) \  
380 - $(DESTDIR)$(bindir)  
381 -  
382 - @$(INSTALL_PROGRAM) \  
383 - $(BINRLS)/$(SONAME) \  
384 - $(DESTDIR)$(bindir)/$(SONAME)  
385 -  
386 - @$(MKDIR) \  
387 - $(DESTDIR)$(libdir)  
388 -  
389 - @$(INSTALL_DATA) \  
390 - $(BINRLS)/$(LIBNAME).dll.a \  
391 - $(DESTDIR)$(libdir)  
392 -  
393 - @$(MKDIR) \  
394 - $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def  
395 -  
396 - @$(INSTALL_DATA) \  
397 - $(BINRLS)/$(LIBNAME).def \  
398 - $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def  
399 -  
400 install-glade: 406 install-glade:
401 407
402 @mkdir -p $(DESTDIR)$(datarootdir)/glade/catalogs 408 @mkdir -p $(DESTDIR)$(datarootdir)/glade/catalogs