Remove keydctl.o in clean rule

[onak.git] / armor.c

diff --git a/armor.c b/armor.c
index bb0085e348d3b73846367b7bab80938e0cc75f21..a192f77d18d8df0f624f67b2b54e2eac5fbb6a39 100644 (file)
--- a/armor.c
+++ b/armor.c
@@ -9,11 +9,11 @@
 #include <stdlib.h>
 
 #include "armor.h"
 #include <stdlib.h>
 
 #include "armor.h"

-#include "config.h"

 #include "keystructs.h"
 #include "log.h"
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "keystructs.h"
 #include "log.h"
 #include "onak-conf.h"
 #include "parsekey.h"

+#include "version.h"

 
 #define ARMOR_WIDTH 64
 
 
 #define ARMOR_WIDTH 64
 


@@ -323,8 +323,8 @@ int armor_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
         */
        putchar_func(ctx, sizeof("-----BEGIN PGP PUBLIC KEY BLOCK-----\n") - 1,
                (unsigned char *) "-----BEGIN PGP PUBLIC KEY BLOCK-----\n");
         */
        putchar_func(ctx, sizeof("-----BEGIN PGP PUBLIC KEY BLOCK-----\n") - 1,
                (unsigned char *) "-----BEGIN PGP PUBLIC KEY BLOCK-----\n");

-       putchar_func(ctx, sizeof("Version: onak " PACKAGE_VERSION "\n\n") - 1,
-               (unsigned char *) "Version: onak " PACKAGE_VERSION "\n\n");
+       putchar_func(ctx, sizeof("Version: onak " ONAK_VERSION "\n\n") - 1,
+               (unsigned char *) "Version: onak " ONAK_VERSION "\n\n");

        
        armor_init(&armor_ctx);
        armor_ctx.putchar_func = putchar_func;
        
        armor_init(&armor_ctx);
        armor_ctx.putchar_func = putchar_func;