[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: 0.1b fails on install
Jun-ichiro itojun Hagino <itojun@iijlab.net> writes:
> sorry I don't have the patch, just a report...
> heimdal 0.1b fails to install in appl/push, during installation of
> pfrom (tries to strip a script). Experienced on NetBSD 1.3.3 and
> FreeBSD 2.2.8.
Try the appended patch.
/assar
--- appl/push/Makefile.in Mon Feb 22 11:35:57 1999
+++ appl/push/Makefile.in Sat Feb 27 11:01:35 1999
@@ -10,7 +10,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# $Id: Makefile.am,v 1.5 1999/02/15 21:34:36 assar Exp $
+# $Id: Makefile.am,v 1.6 1999/02/27 09:58:20 assar Exp $
SHELL = /bin/sh
@@ -88,6 +88,7 @@
MAKE_X_PROGS_BIN = @MAKE_X_PROGS_BIN@
MAKE_X_PROGS_LIBEXEC = @MAKE_X_PROGS_LIBEXEC@
NM = @NM@
+NOINST_HDRS = @NOINST_HDRS@
NROFF = @NROFF@
OTP_dir = @OTP_dir@
PACKAGE = @PACKAGE@
@@ -105,7 +106,7 @@
INCLUDES = -I$(top_builddir)/include $(INCLUDE_krb4) @HESIODINCLUDE@
-bin_PROGRAMS = pfrom
+bin_SCRIPTS = pfrom
libexec_PROGRAMS = push
@@ -119,7 +120,7 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../include/config.h
CONFIG_CLEAN_FILES =
-PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
+PROGRAMS = $(libexec_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I../../include
@@ -130,19 +131,14 @@
X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-pfrom_SOURCES = pfrom.c
-pfrom_OBJECTS = pfrom.o
-pfrom_LDADD = $(LDADD)
-pfrom_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
-$(top_builddir)/lib/des/libdes.la $(top_builddir)/lib/asn1/libasn1.la \
-$(top_builddir)/lib/roken/libroken.la
-pfrom_LDFLAGS =
push_OBJECTS = push.o
push_LDADD = $(LDADD)
push_DEPENDENCIES = $(top_builddir)/lib/krb5/libkrb5.la \
$(top_builddir)/lib/des/libdes.la $(top_builddir)/lib/asn1/libasn1.la \
$(top_builddir)/lib/roken/libroken.la
push_LDFLAGS =
+SCRIPTS = $(bin_SCRIPTS)
+
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -154,10 +150,10 @@
TAR = tar
GZIP = --best
-SOURCES = pfrom.c $(push_SOURCES)
-OBJECTS = pfrom.o $(push_OBJECTS)
+SOURCES = $(push_SOURCES)
+OBJECTS = $(push_OBJECTS)
-all: Makefile $(PROGRAMS)
+all: Makefile $(PROGRAMS) $(SCRIPTS)
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
@@ -169,31 +165,6 @@
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-mostlyclean-binPROGRAMS:
-
-clean-binPROGRAMS:
- -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
-distclean-binPROGRAMS:
-
-maintainer-clean-binPROGRAMS:
-
-install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(bindir)
- @list='$(bin_PROGRAMS)'; for p in $$list; do \
- if test -f $$p; then \
- echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
- $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
- else :; fi; \
- done
-
-uninstall-binPROGRAMS:
- @$(NORMAL_UNINSTALL)
- list='$(bin_PROGRAMS)'; for p in $$list; do \
- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
- done
-
mostlyclean-libexecPROGRAMS:
clean-libexecPROGRAMS:
@@ -261,6 +232,25 @@
@rm -f push
$(LINK) $(push_LDFLAGS) $(push_OBJECTS) $(push_LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
+ @list='$(bin_SCRIPTS)'; for p in $$list; do \
+ if test -f $$p; then \
+ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ else if test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ else :; fi; fi; \
+ done
+
+uninstall-binSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ list='$(bin_SCRIPTS)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+ done
+
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP)
@@ -302,7 +292,7 @@
check: all
$(MAKE)
installcheck:
-install-exec: install-binPROGRAMS install-libexecPROGRAMS
+install-exec: install-libexecPROGRAMS install-binSCRIPTS
@$(NORMAL_INSTALL)
install-data:
@@ -311,12 +301,12 @@
install: install-exec install-data all
@:
-uninstall: uninstall-binPROGRAMS uninstall-libexecPROGRAMS
+uninstall: uninstall-libexecPROGRAMS uninstall-binSCRIPTS
install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
installdirs:
- $(mkinstalldirs) $(DATADIR)$(bindir) $(DATADIR)$(libexecdir)
+ $(mkinstalldirs) $(DATADIR)$(libexecdir) $(DATADIR)$(bindir)
mostlyclean-generic:
@@ -333,39 +323,37 @@
maintainer-clean-generic:
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-mostlyclean: mostlyclean-binPROGRAMS mostlyclean-libexecPROGRAMS \
- mostlyclean-compile mostlyclean-libtool \
- mostlyclean-tags mostlyclean-generic
-
-clean: clean-binPROGRAMS clean-libexecPROGRAMS clean-compile \
- clean-libtool clean-tags clean-generic mostlyclean
-
-distclean: distclean-binPROGRAMS distclean-libexecPROGRAMS \
- distclean-compile distclean-libtool distclean-tags \
- distclean-generic clean
+mostlyclean: mostlyclean-libexecPROGRAMS mostlyclean-compile \
+ mostlyclean-libtool mostlyclean-tags \
+ mostlyclean-generic
+
+clean: clean-libexecPROGRAMS clean-compile clean-libtool clean-tags \
+ clean-generic mostlyclean
+
+distclean: distclean-libexecPROGRAMS distclean-compile \
+ distclean-libtool distclean-tags distclean-generic \
+ clean
-rm -f config.status
-rm -f libtool
-maintainer-clean: maintainer-clean-binPROGRAMS \
- maintainer-clean-libexecPROGRAMS \
+maintainer-clean: maintainer-clean-libexecPROGRAMS \
maintainer-clean-compile maintainer-clean-libtool \
maintainer-clean-tags maintainer-clean-generic \
distclean
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
-.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-mostlyclean-libexecPROGRAMS distclean-libexecPROGRAMS \
+.PHONY: mostlyclean-libexecPROGRAMS distclean-libexecPROGRAMS \
clean-libexecPROGRAMS maintainer-clean-libexecPROGRAMS \
uninstall-libexecPROGRAMS install-libexecPROGRAMS mostlyclean-compile \
distclean-compile clean-compile maintainer-clean-compile \
mostlyclean-libtool distclean-libtool clean-libtool \
-maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info dvi installcheck \
-install-exec install-data install uninstall all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+maintainer-clean-libtool uninstall-binSCRIPTS install-binSCRIPTS tags \
+mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
+distdir info dvi installcheck install-exec install-data install \
+uninstall all installdirs mostlyclean-generic distclean-generic \
+clean-generic maintainer-clean-generic clean mostlyclean distclean \
+maintainer-clean
pfrom: pfrom.in