aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Seebach <seebs@eee12.(none)>2010-06-28 15:39:35 -0500
committerPeter Seebach <seebs@eee12.(none)>2010-06-28 15:41:25 -0500
commitb732e8bcbf5a75eb795b1fe7dae9b8d121d10b3f (patch)
tree3c549223395373467df029d4aed8908e9ffbe60b
parente2b14be08b727d74b073bd28776dd584f4b4c8f2 (diff)
downloadpseudo-b732e8bcbf5a75eb795b1fe7dae9b8d121d10b3f.tar.gz
pseudo-b732e8bcbf5a75eb795b1fe7dae9b8d121d10b3f.tar.bz2
pseudo-b732e8bcbf5a75eb795b1fe7dae9b8d121d10b3f.zip
Remove PSEUDO_SUFFIX from source
The PSEUDO_SUFFIX thing is an installation quirk to allow our build system to tag libpseudo.so with a checksum of the host libc. However, we reuse a prebuilt pseudo server with the new pseudo libraries; this means that encoding the suffix in the environment hackery is a Bad Idea. Update version number to 0.3, since this seems to wrap up a hunk of development effort.
-rw-r--r--ChangeLog.txt5
-rw-r--r--Makefile.in2
-rw-r--r--pseudo.c5
-rw-r--r--pseudo_util.c2
4 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index a074e55..4f17c02 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,8 @@
+2010-06-28: 0.3
+ * (seebs) back out PSEUDO_SUFFIX -- it causes problem when
+ rebuilding the library but not the server, but this is
+ a permissible use case.
+
2010-06-21:
* (seebs) add mkstemp64
diff --git a/Makefile.in b/Makefile.in
index 65a0bd3..7945598 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23,7 +23,7 @@ SUFFIX=@SUFFIX@
SQLITE=@SQLITE@
BITS=@BITS@
MARK64=@MARK64@
-VERSION=0.2
+VERSION=0.3
LIBDIR=$(PREFIX)/lib$(MARK64)
BINDIR=$(PREFIX)/bin
diff --git a/pseudo.c b/pseudo.c
index 1868cf2..5282ca8 100644
--- a/pseudo.c
+++ b/pseudo.c
@@ -165,9 +165,8 @@ main(int argc, char *argv[]) {
break;
case 'V':
printf("pseudo version %s\n", pseudo_version ? pseudo_version : "<undefined>");
- printf("pseudo configuration flags:\n prefix: %s\n suffix: %s\n",
- PSEUDO_PREFIX,
- PSEUDO_SUFFIX);
+ printf("pseudo configuration:\n prefix: %s\n",
+ PSEUDO_PREFIX);
printf("Set PSEUDO_PREFIX to run with a different prefix.\n");
exit(0);
break;
diff --git a/pseudo_util.c b/pseudo_util.c
index 09b6766..f524f9f 100644
--- a/pseudo_util.c
+++ b/pseudo_util.c
@@ -49,7 +49,7 @@ static int pseudo_append_elements(char **newpath, char **root, size_t *allocated
extern char **environ;
static ssize_t pseudo_max_pathlen = -1;
static ssize_t pseudo_sys_max_pathlen = -1;
-static char *libpseudo_name = "libpseudo" PSEUDO_SUFFIX ".so";
+static char *libpseudo_name = "libpseudo.so";
char *pseudo_version = PSEUDO_VERSION;