diff --git a/src/wscript b/src/wscript index 7483f7c21..f0d416200 100644 --- a/src/wscript +++ b/src/wscript @@ -375,7 +375,7 @@ class ns3pcfile_task(Task.Task): 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 @@ includedir=%s 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): diff --git a/wscript b/wscript index bd35d7232..a913bffee 100644 --- a/wscript +++ b/wscript @@ -68,10 +68,8 @@ APPNAME = 'ns' 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 = '.'