new build rules, same changes as in ticket 12 of mrw-c++; refs #14

src/libxml-cxx.pc.in

@@ -1,11 +1,11 @@
-prefix=@PACKAGENAME@
+prefix=@PACKAGE_NAME@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
-Name: @PACKAGENAME@
+Name: @PACKAGE_NAME@
 Description: C++ wrappers around pcsc-lite, cryptoki, openssh
-Version: @VERSION@
+Version: @PACKAGE_VERSION@
 Libs: -L${libdir} -lxml-cxx
 Libs.private: 
 Cflags: -I${includedir} 

src/version.cxx.in

@@ -9,8 +9,8 @@
 
 namespace xml {
   std::string version() {
-    return "@PACKAGENAME@-@VERSION@";
+    return "@PACKAGE_NAME@-@PACKAGE_VERSION@";
   }
-  const std::string WHAT("#(@) @PACKAGENAME@-@VERSION@");
-  const std::string IDENT("$Id: @PACKAGENAME@-@VERSION@ $");
+  const std::string WHAT("#(@) @PACKAGE_NAME@-@PACKAGE_VERSION@");
+  const std::string IDENT("$Id: @PACKAGE_NAME@-@PACKAGE_VERSION@ $");
 }