Download as
Browse Code »

Commit fce56922358741f193a79d24b80f57a220f92650

Authored by Perry Werneck
1 parent 5dac2434
Exists in develop

Fixing win32 build

Showing 3 changed files with 11 additions and 9 deletions   Show diff stats
Makefile.in
  Diff comments   View file @fce5692
... ... @@ -301,7 +301,7 @@ install-macos-application: \
301 301 $(DESTDIR)$(bindir)/$(PRODUCT_NAME)@EXEEXT@
302 302  
303 303 install-windows-application: \
304   - branding/$(PRODUCT_NAME).png \
  304 + $(srcdir)/branding/$(PRODUCT_NAME).png \
305 305 strip
306 306  
307 307 @$(MKDIR) \
... ... @@ -315,11 +315,11 @@ install-windows-application: \
315 315 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)
316 316  
317 317 @$(INSTALL_DATA) \
318   - branding/$(PRODUCT_NAME).png \
  318 + $(srcdir)/branding/$(PRODUCT_NAME).png \
319 319 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).png
320 320  
321 321 @$(INSTALL_DATA) \
322   - CHANGELOG \
  322 + $(srcdir)/CHANGELOG \
323 323 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PACKAGE_NAME).changes
324 324  
325 325 install-icons:
... ...
branding/Makefile.in
  Diff comments   View file @fce5692
... ... @@ -24,9 +24,9 @@ APPLICATION_ID=@APPLICATION_ID@
24 24  
25 25 prefix=@prefix@
26 26 exec_prefix=@exec_prefix@
  27 +srcdir=@srcdir@
27 28 datarootdir=@datarootdir@
28 29 bindir=@bindir@
29   -srcdir=@srcdir@
30 30  
31 31 BUILDDIR=@BUILDDIR@
32 32 BINDIR=$(BUILDDIR)/.bin
... ... @@ -156,7 +156,7 @@ install-windows: \
156 156 @$(MKDIR) $(DESTDIR)$(bindir)
157 157  
158 158 @$(INSTALL_DATA) \
159   - $(PRODUCT_NAME).ico \
  159 + $(srcdir)/$(PRODUCT_NAME).ico \
160 160 $(DESTDIR)$(bindir)/$(PRODUCT_NAME).ico
161 161  
162 162  
... ...
src/include/config.h.in
  Diff comments   View file @fce5692
... ... @@ -24,12 +24,12 @@
24 24 /* do we have malloc.h? */
25 25 #undef HAVE_MALLOC_H
26 26  
27   -/* Define to 1 if you have the <memory.h> header file. */
28   -#undef HAVE_MEMORY_H
29   -
30 27 /* Define to 1 if you have the <stdint.h> header file. */
31 28 #undef HAVE_STDINT_H
32 29  
  30 +/* Define to 1 if you have the <stdio.h> header file. */
  31 +#undef HAVE_STDIO_H
  32 +
33 33 /* Define to 1 if you have the <stdlib.h> header file. */
34 34 #undef HAVE_STDLIB_H
35 35  
... ... @@ -105,7 +105,9 @@
105 105 /* The schema path */
106 106 #undef PRODUCT_PATH
107 107  
108   -/* Define to 1 if you have the ANSI C header files. */
  108 +/* Define to 1 if all of the C90 standard headers exist (not just the ones
  109 + required in a freestanding environment). This macro is provided for
  110 + backward compatibility; new code need not use it. */
109 111 #undef STDC_HEADERS
110 112  
111 113 /* Version number of package */
... ...