summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-05-19 17:00:23 +0400
committerAlexander Nozdrin <alik@sun.com>2010-05-19 17:00:23 +0400
commit759d5bc5351c79ef4835d6ba7ff6db98b56b2041 (patch)
tree574458923d5c91864006d3e044db236b688fe587 /support-files
parent1161d923c8664ea6ae126e3068e06da2a45c4eae (diff)
downloadmariadb-git-759d5bc5351c79ef4835d6ba7ff6db98b56b2041.tar.gz
Another incarnation of the patch for Bug#30708
(make relies GNU extentions). The patch was partially backport from 6.0. Original comment: bug#30708: make relies GNU extensions. Now that we no longer use BitKeeper we can safely remove the SCCS handling with no loss of functionality.
Diffstat (limited to 'support-files')
-rw-r--r--support-files/MacOSX/Makefile.am3
-rw-r--r--support-files/Makefile.am5
-rw-r--r--support-files/RHEL4-SElinux/Makefile.am3
3 files changed, 1 insertions, 10 deletions
diff --git a/support-files/MacOSX/Makefile.am b/support-files/MacOSX/Makefile.am
index 3f11107d714..7d4384a2a56 100644
--- a/support-files/MacOSX/Makefile.am
+++ b/support-files/MacOSX/Makefile.am
@@ -52,6 +52,3 @@ SUFFIXES = .sh
-e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
$< > $@-t
@MV@ $@-t $@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/support-files/Makefile.am b/support-files/Makefile.am
index 42e7ecb1797..7ddb39e1c7c 100644
--- a/support-files/Makefile.am
+++ b/support-files/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = mysql.spec.sh \
magic mysql.m4 \
MySQL-shared-compat.spec.sh \
ndb-config-2-node.ini.sh \
- compiler_warnings.supp \
+ compiler_warnings.supp \
dtrace \
CMakeLists.txt
@@ -129,6 +129,3 @@ SUFFIXES = .sh
-e 's!@''PERL_DATA_DUMPER''@!@PERL_DATA_DUMPER@!' \
$< > $@-t
@MV@ $@-t $@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/support-files/RHEL4-SElinux/Makefile.am b/support-files/RHEL4-SElinux/Makefile.am
index 52292136877..d2143a5285c 100644
--- a/support-files/RHEL4-SElinux/Makefile.am
+++ b/support-files/RHEL4-SElinux/Makefile.am
@@ -18,6 +18,3 @@
## Process this file with automake to create Makefile.in
EXTRA_DIST = mysql.fc mysql.te
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%