[sword-cvs] sword/utilities Makefile.am,1.23,1.24

[sword@www.crosswire.org]

Update of /usr/local/cvsroot/sword/utilities
In directory www:/tmp/cvs-serv18444/utilities

Modified Files:
	Makefile.am 
Log Message:

dglassey: and build the installmgr utility in all circumstances


Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/sword/utilities/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile.am	8 Jul 2003 13:19:41 -0000	1.23
+++ Makefile.am	9 Jul 2003 22:18:04 -0000	1.24
@@ -7,14 +7,15 @@
 txt2sword addgb imp2gbs mod2imp thml2gbs xml2gbs
 
 bin_PROGRAMS = mod2imp mod2osis osis2mod vs2osisref mod2vpl \
-	vpl2mod imp2vs
+	vpl2mod imp2vs installmgr
 
 if INSTALLMGR
-IMGRPROG = installmgr 
+IMGRPROG =
 else
 IMGRPROG = 
 endif
 
+
 if ICU
 ICUPROG = 
 else
@@ -27,8 +28,8 @@
 ZLIBPROG =
 endif
 
-noinst_PROGRAMS += $(ICUPROG) $(IMGRPROG)
-bin_PROGRAMS += $(ZLIBPROG)
+noinst_PROGRAMS += $(ICUPROG)
+bin_PROGRAMS += $(ZLIBPROG) $(IMGRPROG)
 
 if ICU
 endif
@@ -58,10 +59,8 @@
 osis2mod_SOURCES = osis2mod.cpp
 vs2osisref_SOURCES = vs2osisref.cpp
 
-if INSTALLMGR
 installmgr_SOURCES = installmgr.cpp
 installmgr_LDADD = -lcurl $(CURL_LIBS) $(LDADD)
-endif
 
 if ZLIB
 mod2zmod_SOURCES = mod2zmod.cpp