diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2009-08-11 14:37:44 -0600 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2009-08-11 15:17:44 -0600 |
| commit | 886d9b9f4fd9bfd72c2c9728f13b8db1ff2793b7 (patch) | |
| tree | 7afa75c8dd680409fe7049827cf0a4f2905036a5 /ldap/systools | |
| parent | abff3feacb218a7bb65a358dce2e9c90a2f185b1 (diff) | |
| download | ds-886d9b9f4fd9bfd72c2c9728f13b8db1ff2793b7.tar.gz ds-886d9b9f4fd9bfd72c2c9728f13b8db1ff2793b7.tar.xz ds-886d9b9f4fd9bfd72c2c9728f13b8db1ff2793b7.zip | |
Change default branding to 389 - remove lite code
The vendor, brand, and capbrand are set in configure - we should use those
everywhere rather than have to run some sort of script over the code to
change vendor, brand, version, etc. I've added VENDOR, BRAND, CAPBRAND
to the default defines passed to the compiler, and changed the code to use
these defines. And instead of the unintuitively named PRODUCTTEXT macro,
we should use the already defined PRODUCT_VERSION.
This allowed me to get rid of some code. The version was from a generated
file called dirver.h which we don't need anymore, and we don't need the perl
script dirver.pl which generated it.
The vendor string was coming from the dirlite header file. So I also used this
as an excuse to get rid of all references to dirlite once and for all (yay!).
For the places in plain text files which are not substituted, I just used the
generic name Dirsrv or Directory Server instead of having an explicit brand
and/or version in there.
Reviewed by: nkinder (Thanks!)
Diffstat (limited to 'ldap/systools')
| -rw-r--r-- | ldap/systools/idsktune.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ldap/systools/idsktune.c b/ldap/systools/idsktune.c index 1bd0ee1b..122c41de 100644 --- a/ldap/systools/idsktune.c +++ b/ldap/systools/idsktune.c @@ -646,7 +646,7 @@ int sun_check_kern_arch(char *a,char *b) if (flag_debug) printf("DEBUG : Kernel architecture: sun4u\n"); } else { if (flag_html) printf("<P>\n"); - printf("%s: The kernel architecture is %s. Fedora products are optimized\nfor the UltraSPARC architecture and will exhibit poorer performance on earlier\nmachines.\n\n","WARNING",b); + printf("%s: The kernel architecture is %s. " VENDOR " products are optimized\nfor the UltraSPARC architecture and will exhibit poorer performance on earlier\nmachines.\n\n","WARNING",b); if (flag_html) printf("</P>\n"); flag_arch_bad = 1; } @@ -2810,8 +2810,8 @@ static void disk_tests(void) #if defined(_WIN32) /* TBD */ #else - if (access("/usr/fedora",X_OK) == 0) { - sprintf(install_dir,"/usr/fedora"); + if (access("/usr/" VENDOR,X_OK) == 0) { + sprintf(install_dir,"/usr/" VENDOR); } else { sprintf(install_dir,"/opt"); } @@ -3294,7 +3294,7 @@ int main(int argc,char *argv[]) char sysbuf[BUFSIZ]; int nproc; if (flag_html) printf("<P>\n"); - printf("Fedora Directory Server system tuning analysis version %s.\n\n", build_date); + printf(CAPBRAND " Directory Server system tuning analysis version %s.\n\n", build_date); ids_get_platform(sysbuf); nproc = count_processors(); if (nproc == 1) { |