summaryrefslogtreecommitdiff
path: root/net/gofish/patches/patch-aa
blob: 4960fcb21ed0fb597a191fd5308655e8906815dd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
$NetBSD: patch-aa,v 1.1.1.1 2005/10/26 03:42:21 minskim Exp $

--- Makefile.in.orig	2004-12-09 03:59:10.000000000 +0000
+++ Makefile.in
@@ -636,7 +636,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-data-local install-man
+install-data-am: install-man
 
 install-exec-am: install-binPROGRAMS install-binSCRIPTS \
 	install-sbinPROGRAMS
@@ -678,7 +678,7 @@ uninstall-man: uninstall-man1 uninstall-
 	distclean-generic distclean-hdr distclean-tags distcleancheck \
 	distdir distuninstallcheck dvi dvi-am info info-am install \
 	install-am install-binPROGRAMS install-binSCRIPTS install-data \
-	install-data-am install-data-local install-exec install-exec-am \
+	install-data-am install-exec install-exec-am \
 	install-info install-info-am install-man install-man1 \
 	install-man5 install-sbinPROGRAMS install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
@@ -693,40 +693,6 @@ uninstall-man: uninstall-man1 uninstall-
 install-exec-hook:
 	ln -s $(sbindir)/gofish $(DESTDIR)$(sbindir)/gopherd
 
-# Do not override the gofish.conf or icons directories if they exist
-install-data-local: install-root-dir
-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-	if test -f $(DESTDIR)$(sysconfdir)/gofish.conf; then \
-	  $(INSTALL_DATA) gofish.conf $(DESTDIR)$(sysconfdir)/gofish.conf.new; \
-	else \
-	  $(INSTALL_DATA) gofish.conf $(DESTDIR)$(sysconfdir)/gofish.conf; \
-	fi
-	if test -f $(DESTDIR)$(sysconfdir)/gofish-www.conf; then \
-	  $(INSTALL_DATA) gofish-www.conf $(DESTDIR)$(sysconfdir)/gofish-www.conf.new; \
-	else \
-	  $(INSTALL_DATA) gofish-www.conf $(DESTDIR)$(sysconfdir)/gofish-www.conf; \
-	fi
-
-# 1. Only install Configure_GoFish if /var/gopher does not exist.
-#    We don't want to keep installing it for users who are upgrading.
-# 2. Only install the .gopher+ file if it dosen't exist. We don't want to
-#    override any user changes.
-# 3. Only install icon directory if it dosen't exist. We don't want to
-#    override any user installed icons.
-install-root-dir:
-	if test ! -d $(DESTDIR)$(gopherroot); then \
-	  $(mkinstalldirs) $(DESTDIR)$(gopherroot); \
-	  $(INSTALL_DATA) Configure_GoFish $(DESTDIR)$(gopherroot)/Configure_GoFish; \
-	  $(INSTALL_DATA) _cache $(DESTDIR)$(gopherroot)/.cache; \
-	fi
-	if test ! -f $(DESTDIR)$(gopherroot)/.gopher+; then \
-	  $(INSTALL_DATA) _gopher+ $(DESTDIR)$(gopherroot)/.gopher+; \
-	fi
-	if test ! -f $(DESTDIR)$(gopherroot)/icons; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gopherroot)/icons; \
-	  $(INSTALL_DATA) $(srcdir)/icons/*.gif $(DESTDIR)$(gopherroot)/icons; \
-	fi
-
 # Do not remove the root_dir or any part of it
 uninstall-local:
 	rm -f  $(DESTDIR)$(sysconfdir)/gofish.conf