diff options
| author | unknown <mtaylor@qualinost.(none)> | 2007-04-18 14:35:15 -0700 |
|---|---|---|
| committer | unknown <mtaylor@qualinost.(none)> | 2007-04-18 14:35:15 -0700 |
| commit | d429061d6bda816fa1faa390f25b2fa85ee79955 (patch) | |
| tree | 84235f2d70b5bab5f6f0c82dea0e3f88b74bffb2 /debian/rules | |
| parent | ff2e7f450b00bf8814833f754fb624c3e239524f (diff) | |
| parent | ad4922ef673dd026b07f4653b471e7b7b40d0995 (diff) | |
| download | mariadb-git-d429061d6bda816fa1faa390f25b2fa85ee79955.tar.gz | |
Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint-debianv2
into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
configure.in:
Auto merged
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/debian/rules b/debian/rules index 03f85f18160..7b83bc4b97c 100755 --- a/debian/rules +++ b/debian/rules @@ -18,8 +18,8 @@ ifeq ("x$(MYSQL_FLAVOR)","x") endif ifneq ("x$(MYSQL_FLAVOR)","x") - export MYSQL_BASE_VERSION=$(MYSQL_FLAVOR)-$(MYSQL_BASE_VERSION) - export MYSQL_PREVIOUS_BASE_VERSION=$(MYSQL_FLAVOR)-$(MYSQL_PREVIOUS_BASE_VERSION) + MYSQL_BASE_VERSION:=$(MYSQL_FLAVOR)-$(MYSQL_BASE_VERSION) + MYSQL_PREVIOUS_BASE_VERSION:=$(MYSQL_FLAVOR)-$(MYSQL_PREVIOUS_BASE_VERSION) endif PACKAGE=mysql-$(MYSQL_BASE_VERSION) @@ -210,8 +210,10 @@ clean: configure.in Makefile.am control-file rm -f build-stamp cp debian/defs.mk debian/defs.mk.sav + cp debian/control debian/control.sav -make distclean - cp debian/defs.mk.sav debian/defs.mk + mv debian/defs.mk.sav debian/defs.mk + mv debian/control.sav debian/control debconf-updatepo |