--- a/src/wscript Fri Jan 13 16:07:23 2012 -0800
+++ b/src/wscript Mon Jan 16 19:39:45 2012 +0000
@@ -375,7 +375,7 @@
prefix = env.PREFIX
includedir = Utils.subst_vars('${INCLUDEDIR}/%s%s' % (wutils.APPNAME, wutils.VERSION), env)
libdir = env.LIBDIR
- libs = self._self_libs(env, name, '${libdir}')
+ libs = self._self_libs(env, "%s%s-%s-%s" % (wutils.APPNAME, wutils.VERSION, name[4:], env['BUILD_PROFILE']), '${libdir}')
for dep in use:
libs += self._lib(env, dep)
for dep in env.LIBS:
@@ -395,12 +395,12 @@
Name: lib%s
Description: ns-3 module %s
-Version: devel
+Version: %s
Libs: %s
Cflags: %s
Requires: %s\
""" % (prefix, libdir, includedir,
- name, name, ' '.join(libs), ' '.join(cflags), ' '.join(requires))
+ name, name, wutils.VERSION, ' '.join(libs), ' '.join(cflags), ' '.join(requires))
outfile.close()
def run(self):
--- a/wscript Fri Jan 13 16:07:23 2012 -0800
+++ b/wscript Mon Jan 16 19:39:45 2012 +0000
@@ -68,10 +68,8 @@
wutils.VERSION = VERSION
wutils.APPNAME = APPNAME
-# note: here we disable the VNUM for OSX since it causes problems (bug #1251)
+# we don't use VNUM anymore (see bug #1327 for details)
wutils.VNUM = None
-if sys.platform != 'darwin' and re.match(r"^\d+\.\d+(\.\d+)?$", VERSION) is not None:
- wutils.VNUM = VERSION
# these variables are mandatory ('/' are converted automatically)
top = '.'