From 80f47aac2292f3f75290da0c8b2a34f2c79e2636 Mon Sep 17 00:00:00 2001 From: Guido Kanschat Date: Sun, 20 Nov 2005 19:48:37 +0000 Subject: [PATCH] use standard autoconf variable name prefix git-svn-id: https://svn.dealii.org/trunk@11776 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/common/Make.global_options.in | 4 ++-- deal.II/common/Makefile.template.in | 2 +- deal.II/common/scripts/make_dependencies.pl.in | 2 +- deal.II/configure | 2 ++ deal.II/configure.in | 1 + deal.II/contrib/utilities/Makefile.in | 2 +- deal.II/doc/Makefile.in | 2 +- deal.II/doc/doxygen/Makefile.in | 8 ++++---- deal.II/doc/doxygen/options.dox.in | 10 +++++----- 9 files changed, 18 insertions(+), 15 deletions(-) diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index 36bec09c67..bf672e6118 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -21,7 +21,7 @@ # the following lines will be replaced by the output # of ./configure -D = @DEAL2_DIR@ +D = @prefix@ CC = @CC@ CXX = @CXX@ GXX-VERSION = @GXX_VERSION@ @@ -32,7 +32,7 @@ SHLIBLD = @SHLIBLD@ SHLIBFLAGS = @SHLIBFLAGS@ AR = @AR@ RANLIB = @RANLIB@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = -L@prefix@/lib @LDFLAGS@ F77 = @F77@ F77-VERSION = @F77_VERSION@ F77LIBS = @F77LIBS@ diff --git a/deal.II/common/Makefile.template.in b/deal.II/common/Makefile.template.in index dd4c4eabce..22408785a7 100644 --- a/deal.II/common/Makefile.template.in +++ b/deal.II/common/Makefile.template.in @@ -1,6 +1,6 @@ # Directory with the DEAL distribution -D = @DEAL2_DIR@ +D = @prefix@ # Include general rules for making deal.II object files diff --git a/deal.II/common/scripts/make_dependencies.pl.in b/deal.II/common/scripts/make_dependencies.pl.in index 142223040a..c4f24639e6 100644 --- a/deal.II/common/scripts/make_dependencies.pl.in +++ b/deal.II/common/scripts/make_dependencies.pl.in @@ -8,4 +8,4 @@ # since the perl script is not usually called from the directory which # it is in, we need to have the path to the C++ executable. Autoconf # does this for us upon configuration time. -print `@DEAL2_DIR@/common/scripts/make_dependencies @ARGV` +print `@prefix@/common/scripts/make_dependencies @ARGV` diff --git a/deal.II/configure b/deal.II/configure index a16ce838a2..8f015c4379 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -274,6 +274,7 @@ PACKAGE_VERSION='5.3.pre' PACKAGE_STRING='deal.II 5.3.pre' PACKAGE_BUGREPORT='dealii@dealii.org' +ac_default_prefix=`pwd` ac_subdirs_all="$ac_subdirs_all contrib tests" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DEAL_II_MAJOR DEAL_II_MINOR DEAL_II_PATH DEAL2_DIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GXX_VERSION GXX_VERSION_DETAILED CXXFLAGSG CXXFLAGSO CXXFLAGSPIC SHLIBLD SHLIBFLAGS CC_VERSION CFLAGSPIC enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared static_lib_suffix shared_lib_suffix AR RANLIB ac_ct_RANLIB enableparser DEAL_II_DISABLE_PARSER USE_CONTRIB_PETSC DEAL_II_PETSC_DIR DEAL_II_PETSC_ARCH DEAL_II_PETSC_VERSION_MAJOR DEAL_II_PETSC_VERSION_MINOR DEAL_II_PETSC_VERSION_SUBMINOR DEAL_II_DEFINE_DEAL_II_USE_PETSC NEEDS_F77LIBS HSL_INCLUDE_DIR USE_CONTRIB_HSL TECPLOT_INCLUDE_DIR NETCDF_INCLUDE_DIR USE_CONTRIB_METIS DEAL_II_METIS_DIR UMFPACK_LIB UMFPACK_INCLUDE_DIR USE_CONTRIB_UMFPACK DOXYGEN DOT DEAL_II_HAVE_DOT PERL subdirs LDFLAGSPIC LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -1347,6 +1348,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + DEAL_II_PATH=`pwd` DEAL_II_MAJOR=`echo $PACKAGE_VERSION | perl -pi -e 's/^(\d+)\..*/$1/;'` diff --git a/deal.II/configure.in b/deal.II/configure.in index b6db4fa781..7a510ec68d 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -43,6 +43,7 @@ dnl Globals: Paths and versions dnl ------------------------------------------------------------- dnl Set the path to the deal.II libraries to `pwd` +AC_PREFIX_DEFAULT(`pwd`) DEAL_II_PATH=`pwd` dnl Split version number in major and minor diff --git a/deal.II/contrib/utilities/Makefile.in b/deal.II/contrib/utilities/Makefile.in index 8bcfb36e86..f093f9c717 100644 --- a/deal.II/contrib/utilities/Makefile.in +++ b/deal.II/contrib/utilities/Makefile.in @@ -7,7 +7,7 @@ # Include general settings for including DEAL libraries ############################################################ -D = @DEAL2_DIR@ +D = @prefix@ include $D/common/Make.global_options debug-mode = off diff --git a/deal.II/doc/Makefile.in b/deal.II/doc/Makefile.in index 7a7c5a6a3e..174e0c6c45 100644 --- a/deal.II/doc/Makefile.in +++ b/deal.II/doc/Makefile.in @@ -3,7 +3,7 @@ ############################### # Configured variables -D = @DEAL2_DIR@ +D = @prefix@ include $D/common/Make.global_options diff --git a/deal.II/doc/doxygen/Makefile.in b/deal.II/doc/doxygen/Makefile.in index c71ee0ec0a..9f488d0af0 100644 --- a/deal.II/doc/doxygen/Makefile.in +++ b/deal.II/doc/doxygen/Makefile.in @@ -6,7 +6,7 @@ ############################### # Configured variables -D = @DEAL2_DIR@ +D = @prefix@ include $D/common/Make.global_options @@ -20,9 +20,9 @@ private: %.tag: %.dox @DOXYGEN@ $< -base.tag: ../../base/include/*/*.h headers/base/*.h -lac.tag: base.tag ../../lac/include/*/*.h headers/lac/*.h -deal.tag: lac.tag ../../deal.II/include/*/*.h headers/deal.II/*.h +base.tag: @prefix@/base/include/*/*.h headers/base/*.h +lac.tag: base.tag @prefix@/lac/include/*/*.h headers/lac/*.h +deal.tag: lac.tag @prefix@/deal.II/include/*/*.h headers/deal.II/*.h base: base.tag lac: lac.tag diff --git a/deal.II/doc/doxygen/options.dox.in b/deal.II/doc/doxygen/options.dox.in index 46cf26d1f8..23eb0669d4 100644 --- a/deal.II/doc/doxygen/options.dox.in +++ b/deal.II/doc/doxygen/options.dox.in @@ -104,7 +104,7 @@ FULL_PATH_NAMES = YES # If left blank the directory from which doxygen is run is used as the # path to strip. -STRIP_FROM_PATH = @DEAL2_DIR@ +STRIP_FROM_PATH = @prefix@ # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter # (but less readable) file names. This can be useful is your file systems @@ -429,7 +429,7 @@ EXCLUDE_PATTERNS = *.templates.h # directories that contain example code fragments that are included (see # the \include command). -EXAMPLE_PATH = @DEAL2_DIR@/examples/doxygen +EXAMPLE_PATH = @prefix@/examples/doxygen # If the value of the EXAMPLE_PATH tag contains directories, you can use the # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp @@ -899,9 +899,9 @@ SEARCH_INCLUDES = YES # contain include files that are not input files but should be processed by # the preprocessor. -INCLUDE_PATH = @DEAL2_DIR@/base/include \ - @DEAL2_DIR@/lac/include \ - @DEAL2_DIR@/deal.II/include +INCLUDE_PATH = @prefix@/base/include \ + @prefix@/lac/include \ + @prefix@/deal.II/include # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # patterns (like *.h and *.hpp) to filter out the header-files in the -- 2.39.5