[Git][NTPsec/ntpsec][master] 2 commits: Relativize a link.

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
424b1ed0 by Eric S. Raymond at 2016-12-21T17:15:08-05:00
Relativize a link.

- - - - -
ae4152b8 by Eric S. Raymond at 2016-12-21T17:18:27-05:00
Back out a change that mysteriously requred waf to be run twice...

...in order to set up Pyton module links.

- - - - -


1 changed file:

- wscript


Changes:

=====================================
wscript
=====================================
--- a/wscript
+++ b/wscript
@@ -115,7 +115,7 @@ def afterparty(ctx):
     # Also, they need to be able to see the Python extension
     # module built in libntp.
     if ctx.cmd == 'clean' or ctx.cmd == 'distclean':
-        ctx.exec_command("rm -f wafhelpers/*.pyc pylib/__pycache__/*.pyc wafhelpers/__pycache__/*.pyc ntpd/version.h pylib/magic.py pylib/control.py")
+        ctx.exec_command("rm -f wafhelpers/*.pyc pylib/__pycache__/*.pyc wafhelpers/__pycache__/*.pyc ntpd/version.h")
     for x in ("ntpclients",):	# List used to be longer...
             path_build = ctx.bldnode.make_node("pylib")
             path_source = ctx.srcnode.make_node(x + "/ntp")
@@ -133,7 +133,7 @@ def afterparty(ctx):
                     os.remove(path_source.abspath())
     bldnode = ctx.bldnode.abspath()
     if ctx.cmd in ('install', 'build'):
-        os.system("ln -sf %s/libntp/ntpc.so %s/pylib/ntpc.so " % (bldnode, bldnode))
+        os.system("cd %s/pylib; ln -sf ../libntp/ntpc.so ntpc.so " % (bldnode,))
 
 python_scripts = [
         "ntpclients/ntpdig",



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/83794c4ab70fa8e2c91f38fa5f81e41be5e7b6d0...ae4152b84887f0027eb34acf8241aac7bad9f6f6
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20161221/314a2055/attachment.html>