--- pine4.50/pine/osdep/os-osx.h.orig Wed Nov 21 13:28:51 2001 +++ pine4.50/pine/osdep/os-osx.h Wed Nov 21 13:30:51 2001 @@ -89,7 +90,7 @@ default-composer-hdrs or customized-hdrs to get at it. Instead of defining NEVER_ALLOW_CHANGING_FROM, an easier way of preventing From changing is to put the feature "no-allow-changing-from" in the - /usr/local/lib/pine.conf.fixed file. + @PREFIX@/etc/pine.conf.fixed file. ----*/ /* #define NEVER_ALLOW_CHANGING_FROM */ @@ -175,8 +176,8 @@ /*----- System-wide config file ----------------------------------------*/ -#define SYSTEM_PINERC "/usr/local/lib/pine.conf" -#define SYSTEM_PINERC_FIXED "/usr/local/lib/pine.conf.fixed" +#define SYSTEM_PINERC "@PREFIX@/etc/pine.conf" +#define SYSTEM_PINERC_FIXED "@PREFIX@/etc/pine.conf.fixed" --- pine4.50/pine/pine.hlp.orig Fri Nov 30 09:56:26 2001 +++ pine4.50/pine/pine.hlp Fri Nov 30 09:56:47 2001 @@ -596,8 +596,8 @@ executable <Unix search path>/pine persnl cfg ~/.pinerc except cfg ~/.pinercex - global cfg /usr/local/lib/pine.conf - fixed cfg /usr/local/lib/pine.conf.fixed + global cfg @PREFIX@/etc/pine.conf + fixed cfg @PREFIX@/etc/pine.conf.fixed local help /usr/local/lib/pine.info interrupted ~/.pine-interrupted-mail @@ -1952,7 +1952,7 @@ file, execute

-		pine -conf > /usr/local/lib/pine.conf
+		pine -conf > @PREFIX@/etc/pine.conf
 

@@ -1960,7 +1960,7 @@ system configuration file, execute


-		pine -P old-pine.conf -conf > /usr/local/lib/pine.conf
+		pine -P old-pine.conf -conf > @PREFIX@/etc/pine.conf
 

A system configuration file is not required. @@ -2112,7 +2112,7 @@

-P pinerc
Uses the named file as the system wide configuration file instead of -/usr/local/lib/pine.conf on UNIX, or nothing on PC-Pine. +@PREFIX@/etc/pine.conf on UNIX, or nothing on PC-Pine. Pinerc may be either a local file or a remote configuration folder.

@@ -2820,10 +2820,10 @@

The fixed configuration file is normally -/usr/local/lib/pine.conf.fixed. +@PREFIX@/etc/pine.conf.fixed.

The system-wide configuration file is normally -/usr/local/lib/pine.conf for Unix Pine and is normally not +@PREFIX@/etc/pine.conf for Unix Pine and is normally not set for PC-Pine. For PC-Pine, if the environment variable $PINECONF is set, that is used for the system-wide configuration.