Simplification of version string. Use autoconf's PACKAGE_VERSION instead.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@4176 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
0a13ef7ab2
commit
7b39ad8307
2 changed files with 5 additions and 12 deletions
15
Makefile.in
15
Makefile.in
|
|
@ -5,6 +5,7 @@
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
srcdir = @srcdir@
|
srcdir = @srcdir@
|
||||||
|
libdir = @libdir@
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
# Compiler and system configuration
|
# Compiler and system configuration
|
||||||
|
|
@ -23,9 +24,7 @@ RANLIB = @RANLIB@
|
||||||
# instead of `exec_prefix' or, derivatively, `libdir'.
|
# instead of `exec_prefix' or, derivatively, `libdir'.
|
||||||
SWIG_LIB = @swig_lib@
|
SWIG_LIB = @swig_lib@
|
||||||
BIN_DIR = @bindir@
|
BIN_DIR = @bindir@
|
||||||
INCLUDE_DIR = $(prefix)/include
|
TARGET = swig@release_suffix@
|
||||||
RELEASESUFFIX = @release_suffix@
|
|
||||||
TARGET = swig$(RELEASESUFFIX)
|
|
||||||
SOURCE = Source
|
SOURCE = Source
|
||||||
SOURCEDIRS = `ls $(SOURCE)`
|
SOURCEDIRS = `ls $(SOURCE)`
|
||||||
|
|
||||||
|
|
@ -57,12 +56,6 @@ DOH: Source/Include/swigconfig.h
|
||||||
|
|
||||||
.PHONY: SWIG1.1 Modules Swig Preprocessor DOH runtime
|
.PHONY: SWIG1.1 Modules Swig Preprocessor DOH runtime
|
||||||
|
|
||||||
# Config file must be generated at make time, rather than at configure
|
|
||||||
# time because it paths need to be substituted.
|
|
||||||
|
|
||||||
Source/Include/swigconfig.h: Source/Include/swigconfig.h.in Makefile.in config.status
|
|
||||||
sed 's|@-swig_lib-@|$(SWIG_LIB)|g;s|@-exec_prefix-@|$(exec_prefix)|g;s|@-release_suffix-@|$(RELEASESUFFIX)|g' Source/Include/swigconfig.h.in > $@
|
|
||||||
|
|
||||||
#####################################################################
|
#####################################################################
|
||||||
# All the languages SWIG speaks (when it wants to)
|
# All the languages SWIG speaks (when it wants to)
|
||||||
#####################################################################
|
#####################################################################
|
||||||
|
|
@ -339,8 +332,8 @@ uninstall-runtime:
|
||||||
############################################################################
|
############################################################################
|
||||||
|
|
||||||
# distribution directory
|
# distribution directory
|
||||||
dd = @PACKAGE@-@VERSION@
|
dd = @PACKAGE_NAME@-@PACKAGE_VERSION@
|
||||||
srpm = @PACKAGE@-@SWIG_MAJOR_VERSION@.@SWIG_MINOR_VERSION@.@SWIG_SPIN@
|
srpm = @PACKAGE_NAME@-@PACKAGE_VERSION@
|
||||||
|
|
||||||
dist:
|
dist:
|
||||||
@echo 'Dave, what do you want to do w/ "make dist"?'
|
@echo 'Dave, what do you want to do w/ "make dist"?'
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
# tar -cvzf swig-1.3.11cvs.tar.gz SWIG-1.3.11cvs && rpm -tb swig-1.3.11cvs.tar.gz
|
# tar -cvzf swig-1.3.11cvs.tar.gz SWIG-1.3.11cvs && rpm -tb swig-1.3.11cvs.tar.gz
|
||||||
# @configure_input@
|
# @configure_input@
|
||||||
|
|
||||||
%define ver @SWIG_MAJOR_VERSION@.@SWIG_MINOR_VERSION@.@SWIG_SPIN@
|
%define ver @PACKAGE_VERSION@
|
||||||
%define rel 1
|
%define rel 1
|
||||||
%define prefix /usr
|
%define prefix /usr
|
||||||
%define home_page http://swig.sourceforge.net/
|
%define home_page http://swig.sourceforge.net/
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue