Skip to content

Commit

Permalink
Include actual version in runtime path name.
Browse files Browse the repository at this point in the history
Replace ".../diffpy/libdiffpy13" --> ".../diffpy/libdiffpy-1.3"
Follow prevalent convention for directory naming in prefix/share/.
This closes #3.
  • Loading branch information
pavoljuhas committed Jan 19, 2016
1 parent 4c04494 commit da5cf95
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ SConscript('diffpy/SConscript.version')

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

# Load all other sconscripts that update lib_includes and lib_sources
Expand Down
3 changes: 2 additions & 1 deletion src/diffpy/runtimepath.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@ const char* runtimerelpath =
#ifdef DIFFPYRUNTIMERELPATH
STRINGIFY(DIFFPYRUNTIMERELPATH)
#else
"../share/diffpy/libdiffpy"
"../share/diffpy/libdiffpy-"
STRINGIFY(DIFFPY_VERSION_MAJOR)
"."
STRINGIFY(DIFFPY_VERSION_MINOR)
#endif
;
Expand Down

0 comments on commit da5cf95

Please sign in to comment.