21029732 PKG_CONFIG_PATH should be included in CONFIGURE_ENV and BUILD_ENV
21029735 shared-macros should define service manifest and method macros
21093823 sample-manifest should omit or comment "standard" directories and certain files
21144358 configure scripts usually detect wrong host for 64-bit builds
21157847 shared-macros.mk instructions have a typo for studio c99 mode
22067225 common make-rules desired for simplifying makefiles
22067806 transforms needs expanding for desktop services
This patch does the customization for the Solaris way
of installing things. There is a method for doing this
with the configure scripts, but these last few file
paths have not been converted. When they are, this patch
can go away.
--- include/ntp_config.h.orig Thu May 14 06:34:41 2009
+++ include/ntp_config.h Thu May 14 06:15:12 2009
@@ -10,7 +10,7 @@
*/
#ifndef CONFIG_FILE
# ifndef SYS_WINNT
-# define CONFIG_FILE "/etc/ntp.conf"
+# define CONFIG_FILE "/etc/inet/ntp.conf"
# else /* SYS_WINNT */
# define CONFIG_FILE "%windir%\\system32\\drivers\\etc\\ntp.conf"
# define ALT_CONFIG_FILE "%windir%\\ntp.conf"
--- libntp/audio.c.orig Thu May 14 06:34:41 2009
+++ libntp/audio.c Thu May 14 06:15:12 2009
@@ -53,7 +53,7 @@
static struct audio_device device; /* audio device ident */
#endif /* HAVE_SYS_AUDIOIO_H */
#ifdef PCM_STYLE_SOUND
-# define INIT_FILE "/etc/ntp.audio"
+# define INIT_FILE "/etc/inet/ntp.audio"
int agc = SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */
int monitor = SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */
int devmask = 0;
--- ntpdate/ntpdate.c.orig Thu May 14 06:34:41 2009
+++ ntpdate/ntpdate.c Thu May 14 06:15:12 2009
@@ -179,7 +179,7 @@
#ifndef KEYFILE
# ifndef SYS_WINNT
-#define KEYFILE "/etc/ntp.keys"
+#define KEYFILE "/etc/inet/ntp.keys"
# else
#define KEYFILE "%windir%\\ntp.keys"
# endif /* SYS_WINNT */
--- ntpd/refclock_oncore.c
+++ ntpd/refclock_oncore.c
@@ -1211,7 +1211,7 @@ oncore_read_config(
FILE *fd;
char *cc, *ca, line[100], units[2], device[64];
- const char *dirs[] = { "/etc/ntp", "/etc", 0 };
+ const char *dirs[] = { "/etc/inet/ntp", "/etc/inet", 0 };
const char *cp, **cpp;
int i, sign, lat_flg, long_flg, ht_flg, mode, mask;
double f1, f2, f3;