Skip to content

Commit da5cf95

Browse files
committed
Include actual version in runtime path name.
Replace ".../diffpy/libdiffpy13" --> ".../diffpy/libdiffpy-1.3" Follow prevalent convention for directory naming in prefix/share/. This closes #3.
1 parent 4c04494 commit da5cf95

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/SConscript

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ SConscript('diffpy/SConscript.version')
8282

8383
# Path where datafiles should be installed
8484
env['runtimepath'] = os.path.join(
85-
env['datadir'], 'diffpy/libdiffpy%i%i' % env['majorminor'])
85+
env['datadir'], 'diffpy/libdiffpy-%i.%i' % env['majorminor'])
8686
SConscript('runtime/SConscript')
8787

8888
# Load all other sconscripts that update lib_includes and lib_sources

src/diffpy/runtimepath.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ const char* runtimerelpath =
4141
#ifdef DIFFPYRUNTIMERELPATH
4242
STRINGIFY(DIFFPYRUNTIMERELPATH)
4343
#else
44-
"../share/diffpy/libdiffpy"
44+
"../share/diffpy/libdiffpy-"
4545
STRINGIFY(DIFFPY_VERSION_MAJOR)
46+
"."
4647
STRINGIFY(DIFFPY_VERSION_MINOR)
4748
#endif
4849
;

0 commit comments

Comments
 (0)