[sword-cvs] sword/include Makefile.am,1.31,1.32

[sword at www.crosswire.org]

Committed by: dglassey

Update of /cvs/core/sword/include
In directory www:/tmp/cvs-serv16639/include

Modified Files:
	Makefile.am 
Log Message:

fix for automake 1.6
automake 1.7 handles conditional compilation a bit more flexibly
you need define rather than add to variables in if statements then use them elsewhere


Index: Makefile.am
===================================================================
RCS file: /cvs/core/sword/include/Makefile.am,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- Makefile.am	7 May 2004 17:53:10 -0000	1.31
+++ Makefile.am	18 May 2004 12:34:43 -0000	1.32
@@ -161,12 +161,10 @@
 NEWVKEY_HEAD += $(swincludedir)/ztext2.h
 NEWVKEY_HEAD += $(swincludedir)/zverse2.h
 
-SPLIT_HEAD =
 if BUILDNEWVKEY
-SPLIT_HEAD += $(NEWVKEY_HEAD)
+SPLIT_HEAD = $(NEWVKEY_HEAD)
+else
+SPLIT_HEAD =
 endif
-#if BUILDSPLITLIB
-#SPLIT_HEAD += $(NEWVKEY_HEAD)
-#endif
 
 pkginclude_HEADERS += $(REMOTE_HEAD) $(SPLIT_HEAD)