diff options
| author | Lutz Mueller <lutz@users.sourceforge.net> | 2001-12-07 08:53:53 +0000 |
|---|---|---|
| committer | Lutz Mueller <lutz@users.sourceforge.net> | 2001-12-07 08:53:53 +0000 |
| commit | 7f837e4ea1b3cb66d81723cef24a83f9a1d2a0ea (patch) | |
| tree | 27402a6e72d9db2e21337528af3bec09aae3b3fd | |
| parent | 7da8eec3c0488cb4436e574c2c994e87e6ce212e (diff) | |
| download | libgphoto2-7f837e4ea1b3cb66d81723cef24a83f9a1d2a0ea.tar.gz | |
Some autoconf clean-up.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@3425 67ed7778-7388-44ab-90cf-0a291f65f57c
| -rw-r--r-- | gphoto2-config.in | 12 | ||||
| -rw-r--r-- | libgphoto2_port/Makefile.am | 16 | ||||
| -rw-r--r-- | libgphoto2_port/gphoto2-port-config.in | 12 | ||||
| -rw-r--r-- | libgphoto2_port/gphoto2portConf.sh.in | 7 | ||||
| -rw-r--r-- | po/de.po | 2 |
5 files changed, 9 insertions, 40 deletions
diff --git a/gphoto2-config.in b/gphoto2-config.in index 38da5de8c..b35d158b8 100644 --- a/gphoto2-config.in +++ b/gphoto2-config.in @@ -1,9 +1,5 @@ #! /bin/sh -prefix=@prefix@ -exec_prefix=@exec_prefix@ -includedir=@includedir@ - usage() { cat <<EOF @@ -11,7 +7,7 @@ Usage: gphoto2-config [OPTION] Known values for OPTION are: - --prefix=DIR change libgpio prefix [default $prefix] + --prefix=DIR change libgpio prefix [default @prefix@] --libs print library linking information --cflags print pre-processor and compiler flags --help display this help and exit @@ -40,7 +36,7 @@ while test $# -gt 0; do ;; --prefix) - echo $prefix + echo @prefix@ ;; --version) @@ -53,11 +49,11 @@ while test $# -gt 0; do ;; --cflags) - echo -I@prefix@/include/gphoto2 -I@prefix@/include + echo -I@includedir@/gphoto2 -I@includedir@ ;; --libs) - echo -L@libdir@ -lgphoto2 + echo -L@libdir@ -lgphoto2 -lm ;; *) diff --git a/libgphoto2_port/Makefile.am b/libgphoto2_port/Makefile.am index 51b94caf1..d4a585485 100644 --- a/libgphoto2_port/Makefile.am +++ b/libgphoto2_port/Makefile.am @@ -9,12 +9,6 @@ bin_SCRIPTS = gphoto2-port-config SUBDIRS = po intl libgphoto2_port test @IOLIB_SUBDIRS@ doc m4 -## GNOME configuration script -confexecdir=$(libdir) -confexec_DATA = gphoto2portConf.sh - -## Extra files -CLEANFILES=gphoto2portConf.sh EXTRA_DIST = \ AUTHORS \ ChangeLog \ @@ -23,18 +17,8 @@ EXTRA_DIST = \ README \ libgphoto2_port.spec \ gphoto2-port-config.in \ - gphoto2portConf.sh.in \ acconfig.h autogen.sh \ makefile.os2 lgp2port.df docdir = @DOC_DIR@ doc_DATA = AUTHORS README NEWS - -gphoto2portConf.sh: gphoto2portConf.sh.in Makefile -## Use sed and then mv to avoid problems if the user interrupts. - sed -e 's?\@GPPORT_LIBDIR\@?$(GPPORT_LIBDIR)?g' \ - -e 's?\@GPPORT_INCLUDEDIR\@?$(GPPORT_INCLUDEDIR)?g' \ - -e 's?\@GPPORT_LIBS\@?$(GPPORT_LIBS)?g' \ - -e 's?\@LIBGPPORT_VERSION\@?$(LIBGPPORT_VERSION)?g' \ - < $(srcdir)/gphoto2portConf.sh.in > gphoto2portConf.tmp \ - && mv gphoto2portConf.tmp gphoto2portConf.sh diff --git a/libgphoto2_port/gphoto2-port-config.in b/libgphoto2_port/gphoto2-port-config.in index ea49ca039..ff95cce1b 100644 --- a/libgphoto2_port/gphoto2-port-config.in +++ b/libgphoto2_port/gphoto2-port-config.in @@ -1,9 +1,5 @@ #! /bin/sh -prefix=@prefix@ -exec_prefix=@exec_prefix@ -includedir=@includedir@ - usage() { cat <<EOF @@ -11,7 +7,7 @@ Usage: gphoto2-port-config [OPTION] Known values for OPTION are: - --prefix=DIR change libgphoto2-port prefix [default $prefix] + --prefix=DIR change libgphoto2-port prefix [default @prefix@] --libs print library linking information --cflags print pre-processor and compiler flags --help display this help and exit @@ -40,7 +36,7 @@ while test $# -gt 0; do ;; --prefix) - echo $prefix + echo @prefix@ ;; --version) @@ -53,11 +49,11 @@ while test $# -gt 0; do ;; --cflags) - echo -I${includedir}/gphoto2 -I${includedir} @GPPORT_INCLUDEDIR@ + echo -I@includedir@/gphoto2 -I@includedir@ ;; --libs) - echo -L@libdir@ @GPPORT_LIBS@ @LIBS@ + echo -L@libdir@ ;; *) diff --git a/libgphoto2_port/gphoto2portConf.sh.in b/libgphoto2_port/gphoto2portConf.sh.in deleted file mode 100644 index 2b921935f..000000000 --- a/libgphoto2_port/gphoto2portConf.sh.in +++ /dev/null @@ -1,7 +0,0 @@ -# -# Configuration file for using the GPHOTO-PORT library -# -GPPORT_LIBDIR="@GPPORT_LIBDIR@" -GPPORT_LIBS="@GPPORT_LIBS@" -GPPORT_INCLUDEDIR="@GPPORT_INCLUDEDIR@" -MODULE_VERSION="gphoto2-port-@LIBGPPORT_VERSION@" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gphoto2\n" -"POT-Creation-Date: 2001-12-05 22:26+0100\n" +"POT-Creation-Date: 2001-12-05 23:37+0100\n" "PO-Revision-Date: 2001-12-02 23:29+0100\n" "Last-Translator: Colin Marquardt <colin@marquardt-home.de>\n" "Language-Team: German <de@li.org>\n" |