|
 |
d0d21f |
From fdf5b1e5582acae15d485a4c2e2af2ff2819a8c6 Mon Sep 17 00:00:00 2001
|
|
|
d0d21f |
From: Jan Zeleny <jzeleny@redhat.com>
|
|
|
d0d21f |
Date: Tue, 29 Jul 2014 15:36:16 +0200
|
|
|
d0d21f |
Subject: [PATCH] Remove sclbuild, as it's not that useful
|
|
|
d0d21f |
|
|
|
d0d21f |
---
|
|
|
d0d21f |
Makefile | 5 ++---
|
|
|
d0d21f |
sclbuild | 8 --------
|
|
|
d0d21f |
2 files changed, 2 insertions(+), 11 deletions(-)
|
|
|
d0d21f |
delete mode 100755 sclbuild
|
|
|
d0d21f |
|
|
|
d0d21f |
diff --git a/Makefile b/Makefile
|
|
|
d0d21f |
index f050285c1ca85537f30bcfc7bf2cd0a38dd75821..a2d368926638c13ba3b230f02f17e27229046445 100644
|
|
|
d0d21f |
--- a/Makefile
|
|
|
d0d21f |
+++ b/Makefile
|
|
|
d0d21f |
@@ -3,7 +3,7 @@ VERSION=`date +%Y%m%d`
|
|
|
d0d21f |
WARNINGS?=-Wall -Wshadow -Wcast-align -Winline -Wextra -Wmissing-noreturn
|
|
|
d0d21f |
CFLAGS?=-O2
|
|
|
d0d21f |
CFILES=scl.c
|
|
|
d0d21f |
-OTHERFILES=Makefile scl_enabled macros.scl scl.1 scldeps.sh scl.attr brp-scl-compress brp-scl-python-bytecompile scl.bash sclbuild
|
|
|
d0d21f |
+OTHERFILES=Makefile scl_enabled macros.scl scl.1 scldeps.sh scl.attr brp-scl-compress brp-scl-python-bytecompile scl.bash
|
|
|
d0d21f |
SOURCES=$(CFILES) $(OTHERFILES)
|
|
|
d0d21f |
|
|
|
d0d21f |
BINDIR?=/usr/bin
|
|
|
d0d21f |
@@ -37,7 +37,6 @@ install: all
|
|
|
d0d21f |
mkdir -p $(DESTDIR)/$(RPMCONFDIR)/fileattrs
|
|
|
d0d21f |
cp macros.scl $(DESTDIR)/$(CNFDIR)/rpm
|
|
|
d0d21f |
cp scl $(DESTDIR)/$(BINDIR)
|
|
|
d0d21f |
- cp sclbuild $(DESTDIR)/$(BINDIR)
|
|
|
d0d21f |
cp scl_enabled $(DESTDIR)/$(BINDIR)
|
|
|
d0d21f |
cp scl.1 $(DESTDIR)/$(MANDIR)/man1
|
|
|
d0d21f |
cp scl.attr $(DESTDIR)/$(RPMCONFDIR)/fileattrs
|
|
|
d0d21f |
@@ -47,7 +46,7 @@ install: all
|
|
|
d0d21f |
cp scl.bash $(DESTDIR)/$(CNFDIR)/bash_completion.d
|
|
|
d0d21f |
|
|
|
d0d21f |
uninstall:
|
|
|
d0d21f |
- rm -f $(BINDIR)/scl $(BINDIR)/scl_enabled $(BINDIR)/sclbuild
|
|
|
d0d21f |
+ rm -f $(BINDIR)/scl $(BINDIR)/scl_enabled
|
|
|
d0d21f |
rm -f $(CNFDIR)/rpm/macros.scl
|
|
|
d0d21f |
rm -f $(MANDIR)/man1/scl.1
|
|
|
d0d21f |
rm -f $(RPMCONFDIR)/fileattrs/scl.attr
|
|
|
d0d21f |
diff --git a/sclbuild b/sclbuild
|
|
|
d0d21f |
deleted file mode 100755
|
|
|
d0d21f |
index 183d8e8d8fbcd8140052cf9b381ae73bc9f633c1..0000000000000000000000000000000000000000
|
|
|
d0d21f |
--- a/sclbuild
|
|
|
d0d21f |
+++ /dev/null
|
|
|
d0d21f |
@@ -1,8 +0,0 @@
|
|
|
d0d21f |
-#!/bin/sh
|
|
|
d0d21f |
-if [ $# -le 1 ]; then
|
|
|
d0d21f |
- echo "$0 <collection name> <rpmbuild arguments>"
|
|
|
d0d21f |
-else
|
|
|
d0d21f |
- SCL=$1
|
|
|
d0d21f |
- shift
|
|
|
d0d21f |
- rpmbuild $@ --define "scl $SCL"
|
|
|
d0d21f |
-fi
|
|
|
d0d21f |
--
|
|
|
d0d21f |
1.9.3
|
|
|
d0d21f |
|