# HG changeset patch
# User nenolod
# Date 1141101178 28800
# Node ID 3787176f987578ac260eaf30aace2bf1833e326d
# Parent  71189eb31ea9467d03336afbf49add2e1789c9f3
[svn] more fixing

diff -r 71189eb31ea9 -r 3787176f9875 Plugins/Input/flac/plugin.c
--- a/Plugins/Input/flac/plugin.c	Mon Feb 27 20:24:11 2006 -0800
+++ b/Plugins/Input/flac/plugin.c	Mon Feb 27 20:32:58 2006 -0800
@@ -136,7 +136,7 @@
 {
 	NULL,
 	NULL,
-	"FLAC Player v" VERSION,
+	"FLAC Player v" PACKAGE_VERSION,
 	FLAC_XMMS__init,
 	FLAC_XMMS__aboutbox,
 	FLAC_XMMS__configure,
diff -r 71189eb31ea9 -r 3787176f9875 Plugins/Input/vorbis/http.c
--- a/Plugins/Input/vorbis/http.c	Mon Feb 27 20:24:11 2006 -0800
+++ b/Plugins/Input/vorbis/http.c	Mon Feb 27 20:32:58 2006 -0800
@@ -408,7 +408,7 @@
                                        "Host: %s\r\n"
                                        "User-Agent: %s/%s\r\n"
                                        "%s%s\r\n",
-                                       file, host, PACKAGE, VERSION,
+                                       file, host, PACKAGE_NAME, PACKAGE_VERSION,
                                        proxy_auth ? proxy_auth : "",
                                        auth ? auth : "");
                 g_free(file);
diff -r 71189eb31ea9 -r 3787176f9875 audacious.1.in
--- a/audacious.1.in	Mon Feb 27 20:24:11 2006 -0800
+++ b/audacious.1.in	Mon Feb 27 20:32:58 2006 -0800
@@ -1,4 +1,4 @@
-.TH AUDACIOUS "1" "24 October 2005" "Version @VERSION@" "Audacious Manual Pages"
+.TH AUDACIOUS "1" "24 October 2005" "Version @PACKAGE_VERSION@" "Audacious Manual Pages"
 .SH NAME
 Audacious \- an audio player for X.
 .SH SYNOPSIS
diff -r 71189eb31ea9 -r 3787176f9875 audacious.pc.in
--- a/audacious.pc.in	Mon Feb 27 20:24:11 2006 -0800
+++ b/audacious.pc.in	Mon Feb 27 20:32:58 2006 -0800
@@ -1,8 +1,8 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-data_dir=@datadir@/@PACKAGE@
+data_dir=@datadir@/@PACKAGE_NAME@
 
-version=@VERSION@
+version=@PACKAGE_VERSION@
 include_dir=@includedir@
 audacious_include_dir=@includedir@
 lib_dir=@libdir@
@@ -16,7 +16,7 @@
 
 Name: Audacious
 Description: Audacious is a versatile and handy multi platform media player
-Version: @VERSION@
+Version: @PACKAGE_VERSION@
 Requires: @PC_REQUIRES@
 Libs: -L${lib_dir} -laudacious
 Cflags: -I${audacious_include_dir}
diff -r 71189eb31ea9 -r 3787176f9875 audacious.spec.in
--- a/audacious.spec.in	Mon Feb 27 20:24:11 2006 -0800
+++ b/audacious.spec.in	Mon Feb 27 20:32:58 2006 -0800
@@ -20,8 +20,8 @@
 %{!?_with_gnomevfs: %define gnomevfs 0}
 
 Summary:        Audacious
-Name:           @PACKAGE@
-Version:        @VERSION@
+Name:           @PACKAGE_NAME@
+Version:        @PACKAGE_VERSION@
 Release:        1
 Epoch:          0
 License:        GPL
diff -r 71189eb31ea9 -r 3787176f9875 audacious/main.c
--- a/audacious/main.c	Mon Feb 27 20:24:11 2006 -0800
+++ b/audacious/main.c	Mon Feb 27 20:32:58 2006 -0800
@@ -909,9 +909,9 @@
 
     /* Setup l10n early so we can print localized error messages */
     gtk_set_locale();
-    bindtextdomain(PACKAGE, LOCALEDIR);
-    bind_textdomain_codeset(PACKAGE, "UTF-8");
-    textdomain(PACKAGE);
+    bindtextdomain(PACKAGE_NAME, LOCALEDIR);
+    bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
+    textdomain(PACKAGE_NAME);
 
     bmp_init_paths();
     bmp_make_user_dir();