Make things build (not to be confused with "work")

4 files changed, 32 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 2500595..9cbfc49 100755
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ all: rpms
 
 
 manpage:
-	pod2man --center="certmaster-request" --release="" ./docs/certmaster-inventory.pod | gzip -c > ./docs/certmaster-inventory.1.gz
+	pod2man --center="certmaster-request" --release="" ./docs/certmaster-inventory.pod | gzip -c > ./docs/certmaster-request.1.gz
 	pod2man --center="certmaster" --release="" ./docs/certmaster.pod | gzip -c > ./docs/certmaster.1.gz
 	pod2man --center="certmaster-ca" --release="" ./docs/certmaster-ca.pod | gzip -c > ./docs/certmaster-ca.1.gz
 
@@ -65,7 +65,6 @@ install_rpm:
 
 restart:
 	-/etc/init.d/certmaster restart
-	-/etc/init.d/certmasterd restart
 
 recombuild: install_harder restart
 
@@ -86,7 +85,7 @@ money: clean
 	-sloccount --addlang "makefile" $(TOPDIR) $(PYDIRS) $(EXAMPLEDIR) $(INITDIR) 
 
 async: install
-	/sbin/service certmasterd restart
+	/sbin/service certmaster restart
 	sleep 4
 
 rpms: build manpage sdist
diff --git a/po/.gitignore b/po/.gitignore
new file mode 100644
index 0000000..1495005
--- /dev/null
+++ b/po/.gitignore
@@ -0,0 +1 @@
+messages.pot
diff --git a/po/messages.pot~ b/po/messages.pot~
new file mode 100644
index 0000000..b27ddbb
--- /dev/null
+++ b/po/messages.pot~
@@ -0,0 +1,27 @@
+# func.
+# Copyright (C) 2007 Red Hat, inc. 
+# This file is distributed under the same license as the func package.
+# Adrian Likins <alikins@redhat.com>, 2007.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: func 0.16-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-06 12:52-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: func/minion/module_loader.py:92
+#, python-format
+msgid "Could not load %s module: %s"
+msgstr ""
+
+#: func/minion/module_loader.py:97
+#, python-format
+msgid "Could not load %s module"
+msgstr ""
diff --git a/setup.py b/setup.py
index effe61e..3c85112 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,6 @@ if __name__ == "__main__":
  
         manpath    = "share/man/man1/"
         etcpath    = "/etc/%s" % NAME
-        etcmodpath = "/etc/%s/modules" % NAME
         initpath   = "/etc/init.d/"
         logpath    = "/var/log/%s/" % NAME
 	certdir    = "/var/lib/%s/certmaster" % NAME
@@ -40,15 +39,11 @@ if __name__ == "__main__":
 	        	    "%s/minion" % NAME,
 			    "%s/overlord" % NAME,
                 ],
-                data_files = [(initpath, ["init-scripts/certmasterd"]),
-                              (initpath, ["init-scripts/certmaster"]),
+                data_files = [(initpath, ["init-scripts/certmaster"]),
                               (etcpath,  ["etc/minion.conf"]),
                               (etcpath,  ["etc/certmaster.conf"]),
-                              (etcmodpath, []),
-                              (manpath,  ["docs/certmaster.1.gz"]),
-                              (manpath,  ["docs/certmaster-inventory.1.gz"]),
-                              (manpath,  ["docs/certmasterd.1.gz"]),
                               (manpath,  ["docs/certmaster.1.gz"]),
+                              (manpath,  ["docs/certmaster-request.1.gz"]),
                               (manpath,  ["docs/certmaster-ca.1.gz"]),
 			      (rotpath,  ['etc/certmaster_rotate']),
                               (logpath,  []),