]> https://gitweb.dealii.org/ - dealii.git/commitdiff
use standard autoconf variable name prefix
authorGuido Kanschat <dr.guido.kanschat@gmail.com>
Sun, 20 Nov 2005 19:48:37 +0000 (19:48 +0000)
committerGuido Kanschat <dr.guido.kanschat@gmail.com>
Sun, 20 Nov 2005 19:48:37 +0000 (19:48 +0000)
git-svn-id: https://svn.dealii.org/trunk@11776 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/common/Make.global_options.in
deal.II/common/Makefile.template.in
deal.II/common/scripts/make_dependencies.pl.in
deal.II/configure
deal.II/configure.in
deal.II/contrib/utilities/Makefile.in
deal.II/doc/Makefile.in
deal.II/doc/doxygen/Makefile.in
deal.II/doc/doxygen/options.dox.in

index 36bec09c6731129f5edb0ba9389393c9dba111d5..bf672e6118c563506f741ed731ac7d0afc9140fd 100644 (file)
@@ -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@
index dd4c4eabceaf45bfb142943abb3e6768a9bf9da0..22408785a786483461f82e7ca35f3b3db6d45914 100644 (file)
@@ -1,6 +1,6 @@
 # Directory with the DEAL distribution
 
-D = @DEAL2_DIR@
+D = @prefix@
 
 
 # Include general rules for making deal.II object files
index 142223040a229d29f65ec0fe6c158344957e0fe2..c4f24639e6fa48fda86363ec0ff05a9c7f6ffd52 100644 (file)
@@ -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`
index a16ce838a268c9a4c3ed64c69b434e676da28b55..8f015c4379a4f2781f52b9666f3ec8c626000268 100755 (executable)
@@ -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/;'`
index b6db4fa781034dd113cea12244d846b026e7e3be..7a510ec68db1e64baea171e97f8887a9576a484d 100644 (file)
@@ -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
index 8bcfb36e866923f4f137508b9277a829ef8fe0f5..f093f9c717eb8237c34fecedad9699dc4754faf4 100644 (file)
@@ -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
 
index 7a7c5a6a3e455df8e86e721461415ebddcbc69d7..174e0c6c452d9e880078434d2945a032945c000f 100644 (file)
@@ -3,7 +3,7 @@
 ###############################
 # Configured variables
 
-D     = @DEAL2_DIR@
+D     = @prefix@
 include $D/common/Make.global_options
 
 
index c71ee0ec0a08e6aad3886af078565ca5f3e2667d..9f488d0af0256af5337b776b7c164d235c385570 100644 (file)
@@ -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
index 46cf26d1f8eabc8a495fa1e2a9358ab3e571d64f..23eb0669d4c685993a2b7714a37d2609f49cb082 100644 (file)
@@ -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 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.