diff options
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 |