diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-03-07 15:54:50 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2011-03-07 20:55:24 +0100 |
| commit | b40bd26252b6753af9dbb95d4fc033c8d56bf191 (patch) | |
| tree | b28949e8a7b0e27d05f373c785236a1bb1c47660 /manuals_and_examples | |
| parent | 08d2fd4a122cbcab1d1a179471d146ac6c4b5f66 (diff) | |
| download | rasdaman-upstream-b40bd26252b6753af9dbb95d4fc033c8d56bf191.tar.gz rasdaman-upstream-b40bd26252b6753af9dbb95d4fc033c8d56bf191.tar.xz rasdaman-upstream-b40bd26252b6753af9dbb95d4fc033c8d56bf191.zip | |
install: Use custom subdir for libs, data, headers
Redefine $(pkgdatadir), $(pkgincludedir) and $(pkglibdir)
in order to make the subdir component configurable with the
RDM_SUBDIR variable.
Then install all libraries and include files to the package
specific subdirectories, as their names are far too generic
to allow general system wide installation, such as e.g.
"bool.h" or "libnetwork.a".
Move some very custom and non-general scripts (some with generic
names) to a new $(pkglibdir)/bin/ subdir.
Diffstat (limited to 'manuals_and_examples')
| -rw-r--r-- | manuals_and_examples/Makefile.am | 7 | ||||
| -rw-r--r-- | manuals_and_examples/examples/c++/Makefile | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/manuals_and_examples/Makefile.am b/manuals_and_examples/Makefile.am index c8c48ea..9d50775 100644 --- a/manuals_and_examples/Makefile.am +++ b/manuals_and_examples/Makefile.am @@ -30,8 +30,11 @@ dest_Makefile=$(DESTDIR)$(pkgdatadir)/examples/c++/Makefile install-data-hook: -# Set the rasdaman installation root to allow Make finding -# include/ and lib/ for the C++ examples. - sed 's|~~~rmanhome~~~|$(prefix)|' <$(dest_Makefile) >$(dest_Makefile).new - mv $(dest_Makefile).new $(dest_Makefile) + $(SED) \ + -e 's|[@]pkgincludedir@|$(pkgincludedir)|g' \ + -e 's|[@]pkglibdir@|$(pkglibdir)|g' \ + < $(dest_Makefile) > $(dest_Makefile).new + mv -f $(dest_Makefile).new $(dest_Makefile) -# install documentation (cd ..; doxygen manuals_and_examples/doxygen-all.cfg) (cd ..; doxygen manuals_and_examples/doxygen-api.cfg) diff --git a/manuals_and_examples/examples/c++/Makefile b/manuals_and_examples/examples/c++/Makefile index 9ce9174..9dfd548 100644 --- a/manuals_and_examples/examples/c++/Makefile +++ b/manuals_and_examples/examples/c++/Makefile @@ -33,16 +33,18 @@ ################################################################## ######################### Definitions ############################ -# RMANHOME will be updated with a proper value after "make install" -RMANHOME=~~~rmanhome~~~ +# These will be updated with a proper value after "make install" +pkgincludedir = @pkgincludedir@ +pkglibdir = @pkglibdir@ + # RasDaMan central includes -CXXFLAGS += -I$(RMANHOME)/include +CXXFLAGS += -I$(pkgincludedir) CXXFLAGS += -DLINUX -DEARLY_TEMPLATE # add communication flags CXXFLAGS += -DONCRPC # libraries needed for linkage (in particular: rasdaman + exchange formats) -LIBS += -L/usr/lib -L$(RMANHOME)/lib \ +LIBS += -L/usr/lib -L$(pkglibdir) \ -lclientcomm -lrasodmg -lcompression -lconversion -lclientcomm -lrasodmg -lraslib \ -lnetwork -lnetpbm -ljpeg -lpng -ltiff -lmfhdf -ldf -lcrypto \ -lm -lz |