PUD: install example position config file in DOCDIR_OLSRD
authorFerry Huberts <ferry.huberts@pelagic.nl>
Thu, 7 Jun 2012 12:37:16 +0000 (14:37 +0200)
committerFerry Huberts <ferry.huberts@pelagic.nl>
Thu, 7 Jun 2012 13:06:59 +0000 (15:06 +0200)
Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
lib/pud/Makefile
lib/pud/doc/olsrd.conf.default.pud

index 3d446cb..d7e09da 100644 (file)
@@ -56,16 +56,16 @@ install: all
        @$(MAKE) -C "$(NMEALIB_PATH)" DESTDIR="$(DESTDIR)" install
        @$(MAKE) -C "$(LIBRARY_PATH)" DESTDIR="$(DESTDIR)" install
        $(INSTALL_LIB)
-       mkdir -p "$(ETCDIR)"
-       cp "$(RESOURCESDIR)/olsrd.pud.position.conf" "$(ETCDIR)"
+       mkdir -p "$(DOCDIR_OLSRD)"
+       cp "$(RESOURCESDIR)/olsrd.pud.position.conf" "$(DOCDIR_OLSRD)"
        $(STRIP) "$(LIBDIR)/$(PLUGIN_FULLNAME)"
 
 uninstall:
        @$(MAKE) -C "$(NMEALIB_PATH)" DESTDIR="$(DESTDIR)" uninstall
        @$(MAKE) -C "$(LIBRARY_PATH)" DESTDIR="$(DESTDIR)" uninstall
-       rm -f "$(LIBDIR)/lib$(PLUGIN_NAME).so" "$(LIBDIR)/$(PLUGIN_NAME)" "$(ETCDIR)/olsrd.pud.position.conf"
+       rm -f "$(LIBDIR)/lib$(PLUGIN_NAME).so" "$(LIBDIR)/$(PLUGIN_NAME)" "$(DOCDIR_OLSRD)/olsrd.pud.position.conf"
        $(UNINSTALL_LIB)
-       rmdir -v -p --ignore-fail-on-non-empty "$(LIBDIR)" "$(ETCDIR)"
+       rmdir -v -p --ignore-fail-on-non-empty "$(LIBDIR)" "$(DOCDIR_OLSRD)"
 
 clean:
        @echo "[$@]"
index 1948091..18c4481 100644 (file)
@@ -566,8 +566,10 @@ LoadPlugin "./lib/pud/olsrd_pud.so.1.1.0"
 
     # positionFile is the file that contains the position information that the
     #              plugin should use. When this parameter is set then the
-    #              file is read during olsrd startup.
-    #PlParam     "positionFile"                 "/etc/olsrd.pud.position.conf"
+    #              file is read during olsrd startup. It has no default, but an
+    #              example file is available:
+    #                /usr/share/doc/olsrd/olsrd.pud.position.conf
+    # PlParam "positionFile"                    ""
 
     #
     # TX Parameters