diff -ruN pycryptopp-0.7.1-orig/README.ed25519.rst pycryptopp-0.7.1/README.ed25519.rst diff -ruN pycryptopp-0.7.1-orig/setup.py pycryptopp-0.7.1/setup.py --- pycryptopp-0.7.1-orig/setup.py 2017-07-25 22:56:46.000000000 -0400 +++ pycryptopp-0.7.1/setup.py 2017-07-25 23:01:31.000000000 -0400 @@ -81,7 +81,7 @@ # Link with a Crypto++ library that is already installed on the system. - for inclpath in ["/usr/local/include/cryptopp", "/usr/include/cryptopp"]: + for inclpath in ["@PREFIX@/include/cryptopp", "/usr/include/cryptopp"]: if os.path.exists(inclpath): libraries.append("cryptopp") incldir = os.path.dirname(inclpath) @@ -92,16 +92,16 @@ if not libraries: print "Did not locate libcryptopp in the usual places." - print "Adding /usr/local/{include,lib} and -lcryptopp in the hopes" + print "Adding @PREFIX@/{include,lib} and -lcryptopp in the hopes" print "that they will work." # Note that when using cygwin build tools (including gcc) to build # Windows-native binaries, the os.path.exists() will not see the - # /usr/local/include/cryptopp directory but the subsequent call to g++ + # @PREFIX@/include/cryptopp directory but the subsequent call to g++ # will. libraries.append("cryptopp") - include_dirs.append("/usr/local/include") - library_dirs.append("/usr/local/lib") + include_dirs.append("@PREFIX@/include") + library_dirs.append("@PREFIX@/lib") else: # Build the bundled Crypto++ library which is included by source @@ -187,8 +187,6 @@ if "sdist_dsc" in sys.argv: setup_requires.append('stdeb') -data_fnames=['COPYING.GPL', 'COPYING.TGPPL.rst', 'COPYING.MIT.txt', 'COPYING.SPL.txt', 'README.rst'] - readmetext = open('README.rst').read() if readmetext[:3] == '\xef\xbb\xbf': # utf-8 "BOM" @@ -202,7 +200,6 @@ # In case we are building for a .deb with stdeb's sdist_dsc command, we put the # docs in "share/doc/pycryptopp". doc_loc = "share/doc/" + PKG -data_files = [(doc_loc, data_fnames)] commands = {} @@ -405,7 +402,6 @@ exclude_package_data={ '': [ '*.cpp', '*.hpp', ] }, - data_files=data_files, package_dir={"pycryptopp": "src/pycryptopp"}, setup_requires=setup_requires, install_requires=install_requires,