2001-10-21 Tor Lillqvist <tml@iki.fi>

Author: tml
Date: 2001-10-21 18:40:38 GMT
2001-10-21  Tor Lillqvist  <tml@iki.fi>

	* Makefile.am (EXTRA_DIST): Distribute README.win32.

	* README.win32: Describe the behaviour in more detail.

diff --git a/ChangeLog b/ChangeLog
index 97d6cfdb636e7d5930f95fb3484eaedcdfac4dd5..4da4ed92b247180eb59eec72a19a2e4b17513e7c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,15 @@
 2001-10-21  Tor Lillqvist  <tml@iki.fi>
 
+       * Makefile.am (EXTRA_DIST): Distribute README.win32.
+
        * main.c (main): (Win32): Add option --prefix-variable in case the
        variable used in a .pc file as "prefix" isn't called
        "prefix".
 
        * pkg-config.1: Document it.
 
+       * README.win32: Describe the behaviour in more detail.
+
 2001-10-19  Tor Lillqvist  <tml@iki.fi>
 
        * main.c: (Win32): Add option --dont-define-prefix on Windows. The

diff --git a/Makefile.am b/Makefile.am
index 8abe8f4b8d29d07c0bd594b2c2ba6e334c3dded3..7368e8a9b180935ade7c47d7f6d7a6ae35b4c2bc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ m4dir = $(datadir)/aclocal
 m4_DATA = pkg.m4
 
 man_MANS = pkg-config.1
-EXTRA_DIST = $(m4_DATA) $(man_MANS)
+EXTRA_DIST = $(m4_DATA) $(man_MANS) README.win32
 
 bin_PROGRAMS = pkg-config
 

diff --git a/README.win32 b/README.win32
index ef0f5c1ac5fbc8694c936ad52da9d60fec4ad32a..c0676edf440cde0ecdb71f059784cd2c07457974 100644 (file)
--- a/README.win32
+++ b/README.win32
@@ -14,8 +14,8 @@ usable both for MSVC users and gcc ("mingw") users.
 There should be no compile-time paths built into the executable of
 pkg-config. Likewise, not in the libraries it describes either.
 
-We use one optional entry in the Registry: The path to the pkgconfig
-installation prefix. (This can be either user-specific (in
+pkg-config uses one optional entry in the Registry: The path to the
+pkgconfig installation prefix. (This can be either user-specific (in
 HKEY_CURRENT_USER) or for the whole machine (in HKEY_LOCAL_MACHINE).)
 If pkg-config.exe is invoked from the "bin" subdirectory of a
 directory with a lib/pkgconfig subdirectory, no Registry entry is even
@@ -23,10 +23,16 @@ needed, as pkgconfig (actually, the
 g_win32_get_package_installation_directory() function in GLib) figures
 out the directory by itself.
 
-The intention is that a developer package for some library being
-desribed by a .pc file is installed using some simple installer, that
-edits the user-selected installation directory into the .pc file
-before storing the .pc file where pkg-config can find it.
+When pkg-config is invoked on Windows, it sets the "prefix" variable
+to pkg-config's own installation prefix. (I.e. the same installation
+prefix that it uses when determining where to find the pkgconfig
+directory.) Thus, if an end-user (developer) installs a "developer"
+package (headers, import libraries, .pc file) for some software in the
+same directory tree where pkg-config is installed, everything should
+just work, even if the .pc file for that software of course doesn't
+know where the software actually is installed. This works as long as
+the .pc file uses the variable name "prefix" for its installation
+prefix. At least GLib, ATK, Pango and GTK does this.
 
 On Unix, pkg-config is built using its own copy of GLib 1.2.8. On
 Windows, we use the normal GLib available for Windows (1.3.9