reguire gnupg1 on f>=31; sense the system to use gpg1 when installed

[nodemanager.git] / doc / Makefile

diff --git a/doc/Makefile b/doc/Makefile
index be40171..1c4a309 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -4,8 +4,6 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Makefile 5574 2007-10-25 20:33:17Z thierry $
-#
 
 all: NMAPI.html
 
@@ -23,7 +21,7 @@ NMAPI.xml: NMAPI.xml.in
        $(if $(local-docbook-43), \
        echo Using locally installed DTD $(local-docbook-43), \
        echo WARNING - could not locate local DTD - using remote $(remote-docbook-43))
-       sed -e s/@DOCBOOK-43@/$(docbook-43)/ $< > $@
+       sed -e s,@DOCBOOK-43@,$(docbook-43), $< > $@
 
 .NMAPI.xml.valid: Methods.xml
 
@@ -31,7 +29,7 @@ NM_SOURCES = ../api_calls.py
 
 # path needs to mention PLCAPI/doc (for DocBook) and PLCAPI/ (for PLC.Parameter)
 Methods.xml: DocBookLocal.py $(NM_SOURCES)
-       PYTHONPATH=..:../../PLCAPI:../../PLCAPI/doc ./DocBookLocal.py > $@
+       PYTHONPATH=..:../../plcapi:../../plcapi/doc ./DocBookLocal.py > $@
 
 #
 # Documentation