[Wesnoth-cvs-commits] wesnoth/src Makefile.am

[Yann Dirson]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    05/03/19 13:22:39

Modified files:
        src            : Makefile.am 

Log message:
        make sure the right sdl_ttf header is used when building out of source 
tree

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/Makefile.am.diff?tr1=1.81&tr2=1.82&r1=text&r2=text

Patches:
Index: wesnoth/src/Makefile.am
diff -u wesnoth/src/Makefile.am:1.81 wesnoth/src/Makefile.am:1.82
--- wesnoth/src/Makefile.am:1.81        Wed Mar  9 21:21:37 2005
+++ wesnoth/src/Makefile.am     Sat Mar 19 13:22:38 2005
@@ -537,10 +537,10 @@
 
 wesnoth_zip_LDADD = @SDL_LIBS@ @SDL_NET_LIBS@
 
-AM_CXXFLAGS = -I sdl_ttf -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@ 
-DWESNOTH_PATH=\"$(pkgdatadir)\" \
+AM_CXXFLAGS = -I $(srcdir)/sdl_ttf -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@ 
-DWESNOTH_PATH=\"$(pkgdatadir)\" \
        -DLOCALEDIR=\"$(LOCALEDIR)\" 
-DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR)
 
-AM_CFLAGS = -I sdl_ttf -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@ 
-DWESNOTH_PATH=\"$(pkgdatadir)\" \
+AM_CFLAGS = -I $(srcdir)/sdl_ttf -I../intl -I$(top_srcdir)/intl @SDL_CFLAGS@ 
-DWESNOTH_PATH=\"$(pkgdatadir)\" \
        -DLOCALEDIR=\"$(LOCALEDIR)\" 
-DHAS_RELATIVE_LOCALEDIR=$(HAS_RELATIVE_LOCALEDIR)
 
 if X11