summaryrefslogtreecommitdiff
path: root/GNUmakefile
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2012-03-07 10:26:44 +0100
committerSimon Josefsson <simon@josefsson.org>2012-03-07 10:27:54 +0100
commit2259a29c5ae7c34c7709235c96f47a069c2394bb (patch)
treef320f84742192dfe418df9bc16d4dd46b974463f /GNUmakefile
parent3332d9cab1e9ab8b6c991c7ff0f4a2bda1ea7544 (diff)
downloadlibtasn1-2259a29c5ae7c34c7709235c96f47a069c2394bb.tar.gz
libtasn1-2259a29c5ae7c34c7709235c96f47a069c2394bb.tar.bz2
libtasn1-2259a29c5ae7c34c7709235c96f47a069c2394bb.zip
Update gnulib files.
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile14
1 files changed, 2 insertions, 12 deletions
diff --git a/GNUmakefile b/GNUmakefile
index d0fd3e8..58f2ead 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -20,20 +20,10 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Systems where /bin/sh is not the default shell need this. The $(shell)
-# command below won't work with e.g. stock DOS/Windows shells.
-ifeq ($(wildcard /bin/s[h]),/bin/sh)
-SHELL = /bin/sh
-else
-# will be used only with the next shell-test line, then overwritten
-# by a configured-in value
-SHELL = sh
-endif
-
# If the user runs GNU make but has not yet run ./configure,
# give them a diagnostic.
-_have-Makefile := $(shell test -f Makefile && echo yes)
-ifeq ($(_have-Makefile),yes)
+_gl-Makefile := $(wildcard [M]akefile)
+ifneq ($(_gl-Makefile),)
# Make tar archive easier to reproduce.
export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner