summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMukund Sivaraman <muks@banu.com>2008-03-30 16:48:47 -0700
committerMukund Sivaraman <muks@banu.com>2008-03-30 16:48:47 -0700
commite229b360839fbfa3935707ba2c84f8041cf106c0 (patch)
tree076d1e68b977461762b2f6daa247bb863539946f
parentd9c41d4e4d12530ea2f6239c5db2c4bad182eeaf (diff)
downloadtinyproxy-e229b360839fbfa3935707ba2c84f8041cf106c0.tar.gz
tinyproxy-e229b360839fbfa3935707ba2c84f8041cf106c0.zip
Moved RPM packaging dir to top-level
-rw-r--r--Makefile.am16
-rw-r--r--rpm/tinyproxy-initd (renamed from packaging/redhat/tinyproxy-initd)0
-rw-r--r--rpm/tinyproxy.spec (renamed from packaging/redhat/tinyproxy.spec)0
3 files changed, 7 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 6228171..a1cdc9d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,19 @@
-# Redhat spec files (from RPMs)
-REDHAT_DIR = packaging/redhat
-REDHAT = \
- $(REDHAT_DIR)/tinyproxy-initd \
- $(REDHAT_DIR)/tinyproxy.spec
+# RPM spec files
+RPM_DIR = rpm
+RPM_FILES = \
+ $(RPM_DIR)/tinyproxy-initd \
+ $(RPM_DIR)/tinyproxy.spec
# Packaging files
-PACKAGING = $(REDHAT)
+PACKAGING_FILES = $(RPM_FILES)
-#
# The following files are required for the build process
-#
CONFIG_FILES = \
config/config.guess config/config.sub \
config/ltmain.sh config/install-sh config/missing config/mkinstalldirs \
config/typecheck.m4 config/argenable.m4
-EXTRA_DIST = $(CONFIG_FILES) TODO $(PACKAGING) bootstrap
+EXTRA_DIST = $(CONFIG_FILES) TODO $(PACKAGING_FILES) bootstrap
SUBDIRS = src doc
install-data-local: tinyproxy-configure-file tinyproxy-html-files
diff --git a/packaging/redhat/tinyproxy-initd b/rpm/tinyproxy-initd
index a1896bd..a1896bd 100644
--- a/packaging/redhat/tinyproxy-initd
+++ b/rpm/tinyproxy-initd
diff --git a/packaging/redhat/tinyproxy.spec b/rpm/tinyproxy.spec
index 7ef87fc..7ef87fc 100644
--- a/packaging/redhat/tinyproxy.spec
+++ b/rpm/tinyproxy.spec