Commit: 9b545d86e1f5247fdf5b46701f1dcb8afac871b7 Parent: a29ac8b14c100c17e5f14d9b5bb2fdc815d2300f Author: Moritz Luedecke Date: Sat, 23 Sep 2017 15:45:37 +0200 Add VERSION and PACKAGE_BUGREPORT Diffstat:
| M | config.mk | | | 17 | +++++++++-------- |
| M | pinentry/pinentry.c | | | 4 | ++-- |
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/config.mk b/config.mk @@ -1,7 +1,8 @@ -# pinentry-dmenu version -VERSION = 0.1 +# Pinentry settings +VERSION = 0.1 +PACKAGE_BUGREPORT = https://github.com/ritze/pinentry-dmenu -# paths +# Paths PREFIX = /usr/local MANPREFIX = ${PREFIX}/share/man @@ -12,20 +13,20 @@ X11LIB = /usr/X11R6/lib XINERAMALIBS = -lXinerama XINERAMAFLAGS = -DXINERAMA -# freetype +# Freetype FREETYPELIBS = -lfontconfig -lXft FREETYPEINC = /usr/include/freetype2 # OpenBSD (uncomment) #FREETYPEINC = ${X11INC}/freetype2 -# includes and libs +# Includes and libs INCS = -I${X11INC} -I${FREETYPEINC} LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -# flags -CPPFLAGS = -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} +# Flags +CPPFLAGS = -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} -DPACKAGE_VERSION=\"${VERSION}\" -DPACKAGE_BUGREPORT=\"${PACKAGE_BUGREPORT}\" CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} LDFLAGS = -s ${LIBS} -# compiler and linker +# Compiler and linker CC = cc diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c @@ -393,9 +393,9 @@ my_strusage( int level ) { case 11: p = this_pgmname; break; case 12: p = "pinentry"; break; - case 13: p = "*REDACTED*"; break; + case 13: p = PACKAGE_VERSION; break; case 14: p = "Copyright (C) 2015 g10 Code GmbH"; break; - case 19: p = "Please report bugs to <" "*REDACTED*" ">.\n"; break; + case 19: p = "Please report bugs to <" PACKAGE_BUGREPORT ">.\n"; break; case 1: case 40: {