Mercurial > audlegacy

changeset 747:0cf543c6a088 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] another kludge for pkgsrc, C++ edition
author nenolod
date Mon, 27 Feb 2006 20:22:27 -0800
parents be50c0258c20
children 71189eb31ea9
files Plugins/Input/cdaudio/cddb.c Plugins/Input/tonegen/tonegen.c mk/objective.mk
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Plugins/Input/cdaudio/cddb.c	Mon Feb 27 20:18:03 2006 -0800
+++ b/Plugins/Input/cdaudio/cddb.c	Mon Feb 27 20:22:27 2006 -0800
@@ -139,8 +139,8 @@
         }
 
         if (!client || !version) {
-            client = PACKAGE;
-            version = VERSION;
+            client = PACKAGE_NAME;
+            version = PACKAGE_VERSION;
         }
 
         buffer = g_strdup_printf("&hello=nobody+localhost+%s+%s",
@@ -382,7 +382,7 @@
             command++;
         default:
             g_log(NULL, G_LOG_LEVEL_WARNING, "%s: illegal cddb-data: %s",
-                  PACKAGE, buffer);
+                  PACKAGE_NAME, buffer);
             break;
         }
 
@@ -603,7 +603,7 @@
             command++;
         default:
             g_log(NULL, G_LOG_LEVEL_WARNING, "%s: illegal cddb-data: %s",
-                  PACKAGE, buffer);
+                  PACKAGE_NAME, buffer);
             break;
         }
 
--- a/Plugins/Input/tonegen/tonegen.c	Mon Feb 27 20:18:03 2006 -0800
+++ b/Plugins/Input/tonegen/tonegen.c	Mon Feb 27 20:22:27 2006 -0800
@@ -259,6 +259,6 @@
 
 InputPlugin *get_iplugin_info(void)
 {
-	tone_ip.description = g_strdup_printf(_("Tone Generator %s"), VERSION);
+	tone_ip.description = g_strdup_printf(_("Tone Generator %s"), PACKAGE_VERSION);
 	return &tone_ip;
 }
--- a/mk/objective.mk	Mon Feb 27 20:18:03 2006 -0800
+++ b/mk/objective.mk	Mon Feb 27 20:22:27 2006 -0800
@@ -13,6 +13,7 @@
 BINDIR = $(bindir)
 INCLUDEDIR = $(pkgincludedir)
 CFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include
+CXXFLAGS += -DHAVE_CONFIG_H -I/usr/pkg/include
 
 default: all
 all: build