summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <luke@HP-dv6246us-u910.(none)>2010-03-28 16:14:48 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-06-26 00:30:19 -0600
commitfb39ea1f40101ba71dd64a3b9a929bfb58f964f7 (patch)
tree93b28c68702985dfe41ff4e928a0447c349dcdb1
parent98f2efbe20e2d9d03e5296293cc8f52c95af72f5 (diff)
maybe this helps?
-rw-r--r--Makefile.in1
-rw-r--r--diff/main.mk.in1
-rw-r--r--pkgthing/main.mk.in1
-rw-r--r--ptranslate/main.mk.in1
-rw-r--r--ptranslate/translators-posix/main.mk.in4
-rw-r--r--rvs/main.mk.in1
-rw-r--r--rvs/plugins/filedata/bin/commit33
-rw-r--r--rvs/plugins/filedata/bin/get23
-rw-r--r--rvs/plugins/files/bin/commit36
-rw-r--r--rvs/plugins/plugin.mk.in2
-rw-r--r--rvs/wrapper/main.mk.in1
11 files changed, 2 insertions, 102 deletions
diff --git a/Makefile.in b/Makefile.in
index a6f3160..8bd27a8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,6 +26,7 @@ sbindir = @sbindir@
libexecdir = @libexecdir@
dirs = $(DESTDIR) $(prefix) $(exec_prefix) $(bindir) $(sbindir) $(libexecdir)
srcdir = @srcdir@
+VPATH = $(srcdir)
# Programs ###########################################################
SHELL = /bin/sh
diff --git a/diff/main.mk.in b/diff/main.mk.in
index 9245a96..9a6f8b5 100644
--- a/diff/main.mk.in
+++ b/diff/main.mk.in
@@ -20,7 +20,6 @@ ver = 1.1
# general stuffs #####################################################
all : diff-daemon patch-daemon
.SUFFIXES :
-VPATH = $(srcdir)
filelist = \
COPYING \
configure \
diff --git a/pkgthing/main.mk.in b/pkgthing/main.mk.in
index f17ab76..84c6b99 100644
--- a/pkgthing/main.mk.in
+++ b/pkgthing/main.mk.in
@@ -20,7 +20,6 @@ ver = 0.0
# general stuffs #####################################################
all : src/libexec/find src/libexec/search src/pkgthing src/pkgthing.mk
.SUFFIXES :
-VPATH = $(srcdir)
filelist = \
COPYING \
configure \
diff --git a/ptranslate/main.mk.in b/ptranslate/main.mk.in
index 35da289..73dcfa3 100644
--- a/ptranslate/main.mk.in
+++ b/ptranslate/main.mk.in
@@ -22,7 +22,6 @@ trans = @trans@
all : translators ptranslate
install : install-translators $(DESTDIR)$(bindir)/ptranslate
.SUFFIXES :
-VPATH = $(srcdir)
filelist = \
COPYING \
configure \
diff --git a/ptranslate/translators-posix/main.mk.in b/ptranslate/translators-posix/main.mk.in
index 683db45..085c61e 100644
--- a/ptranslate/translators-posix/main.mk.in
+++ b/ptranslate/translators-posix/main.mk.in
@@ -17,14 +17,12 @@
# along with this program; see the file COPYING.
# If not, see <http://www.gnu.org/licenses>.
-mysrcdir = $(srcdir)/translators-posix
+mysrcdir = $(srcdir)
all : x-bzip2 x-gzip x-tar
install : mime install-x-bzip2 install-x-gzip install-x-tar
.PHONY : install-x-bzip2 install-x-gzip install-x-tar
.SUFFIXES :
-VPATH = $(mysrcdir)
-$(info $(VPATH))
mime :
$(MKDIR) $(DESTDIR)$(libexecdir)/media-types
diff --git a/rvs/main.mk.in b/rvs/main.mk.in
index 11fca5c..33be1e9 100644
--- a/rvs/main.mk.in
+++ b/rvs/main.mk.in
@@ -28,7 +28,6 @@ dirs += $(sysconfdir) $(BINDIR) $(TMPDIR) $(LIBDIR) $(ETCDIR)
.PHONY: all
all : wrapper plugins
.SUFFIXES :
-VPATH = $(srcdir)
filelist = \
COPYING \
configure \
diff --git a/rvs/plugins/filedata/bin/commit b/rvs/plugins/filedata/bin/commit
deleted file mode 100644
index 9b7f59a..0000000
--- a/rvs/plugins/filedata/bin/commit
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-name='rvs filedata commit'
-ver=0.9
-# Copyright (C) 2009 Luke Shumaker
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING.
-# If not, see <http://www.gnu.org/licenses>.
-
-out="$1"
-file="$2"
-hash="`cat /dev/stdin`"
-
-temp=`mktemp`
-echo "Hash: $hash" > "$temp"
-stat "$file" >> "$temp"
-
-meta=`sha1sum "$temp" | sed "s/ .*$//"`
-if [ ! -f "$REPO/@ID@/$hash" ]; then
- install -m 644 -o $USER -g $USER -T "$temp" "$REPO/@ID@/$meta"
-fi
-echo "$meta"
-
diff --git a/rvs/plugins/filedata/bin/get b/rvs/plugins/filedata/bin/get
deleted file mode 100644
index 321d5f8..0000000
--- a/rvs/plugins/filedata/bin/get
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-name='rvs filedata get'
-ver=0.9
-# Copyright (C) 2009 Luke Shumaker
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING.
-# If not, see <http://www.gnu.org/licenses>.
-
-out="$1"
-
-echo "yeah, this hasn't been coded yet, sorry!"
-
diff --git a/rvs/plugins/files/bin/commit b/rvs/plugins/files/bin/commit
deleted file mode 100644
index 63eaac1..0000000
--- a/rvs/plugins/files/bin/commit
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-name='rvs files commit'
-ver=0.9
-# Copyright (C) 2009-2010 Luke Shumaker
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING.
-# If not, see <http://www.gnu.org/licenses>.
-
-source "$libexecdir/@ID@/stdio"
-
-# commit FILE
-file=${1-.} # take arg1 as the file, default to the current directory
-
-if [ ! -e "$file" ]; then
- error "file \`$file' does not exist";
-else
- foundMod='false';
- for type in select/*; do
- if "$type" "$file"; then foundMod='true'; break; fi
- done
- if [ "$foundMod" == 'false' ]; then
- error "cannot handle file type of \`$file'"
- fi
-fi
-
diff --git a/rvs/plugins/plugin.mk.in b/rvs/plugins/plugin.mk.in
index 8af5fcc..f365dfa 100644
--- a/rvs/plugins/plugin.mk.in
+++ b/rvs/plugins/plugin.mk.in
@@ -34,8 +34,6 @@ all : $(name)
.SUFFIXES :
# build ############################################################
-$(info srcdir:$(srcdir))
-
srcFiles = $(filter-out %/Makefile.in,$(shell find $(srcdir)/ -type f))
shSrcFiles = $(filter %.sh,$(srcFiles))
diff --git a/rvs/wrapper/main.mk.in b/rvs/wrapper/main.mk.in
index 0f24d6b..4de7eb8 100644
--- a/rvs/wrapper/main.mk.in
+++ b/rvs/wrapper/main.mk.in
@@ -27,7 +27,6 @@ dirs += $(sysconfdir) $(BINDIR) $(TMPDIR) $(LIBDIR) $(ETCDIR)
# phony targets ####################################################
.PHONY : all
all : Makefiles rvs
-VPATH = $(srcdir)
filelist=$(patsubst $(srcdir)/%,%,$(shell find $(srcdir)/* -type f))
# most everything ##################################################