Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/ejabberd/patches/ejabberd-install.patch
author Tomas Klacko <tomas.klacko@oracle.com>
Thu, 20 Mar 2014 05:08:05 -0700
branchs11-update
changeset 2992 d9071f35b6d4
parent 353 d9644516b4a8
permissions -rw-r--r--
17851169 ksh93 core dump in sh_assignok() function
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
353
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     1
 
--- ejabberd-2.1.8/src/Makefile.in	Mon Jun  6 12:24:32 2011
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     2
 
+++ ejabberd-2.1.8-patch/src/Makefile.in	Thu Jun 16 14:54:13 2011
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     3
 
@@ -74,1 +74,1 @@
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     4
 
-  INSTALL_EPAM=install -m 750 $(O_USER) epam $(PBINDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     5
 
+  INSTALL_EPAM=ginstall -m 750 $(O_USER) epam $(PBINDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     6
 
@@ -186,1 +186,1 @@
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     7
 
-	install -d -m 750 $(G_USER) $(ETCDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     8
 
+	ginstall -d -m 750 $(G_USER) $(ETCDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
     9
 
@@ -188,2 +188,2 @@
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    10
 
-		&& install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new \
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    11
 
-		|| install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    12
 
+		&& ginstall -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new \
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    13
 
+		|| ginstall -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    14
 
@@ -198,4 +198,4 @@
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    15
 
-	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    16
 
-		&& install -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    17
 
-		|| install -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    18
 
-	install -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    19
 
+	[ -f $(ETCDIR)/ejabberd/ejabberdctl.cfg ] \
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    20
 
+		&& ginstall -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    21
 
+		|| ginstall -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    22
 
+	ginstall -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    23
 
@@ -204,2 +204,2 @@
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    24
 
-	[ -d $(SBINDIR) ] || install -d -m 755 $(SBINDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    25
 
-	install -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    26
 
+	[ -d $(SBINDIR) ] || ginstall -d -m 755 $(SBINDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    27
 
+	ginstall -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    28
 
@@ -214,3 +214,3 @@
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    29
 
-	install -d $(BEAMDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    30
 
-	install -m 644 *.app $(BEAMDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    31
 
-	install -m 644 *.beam $(BEAMDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    32
 
+	ginstall -d $(BEAMDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    33
 
+	ginstall -m 644 *.app $(BEAMDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    34
 
+	ginstall -m 644 *.beam $(BEAMDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    35
 
@@ -220,12 +220,12 @@
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    36
 
-	install -d $(INCLUDEDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    37
 
-	install -m 644 *.hrl $(INCLUDEDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    38
 
-	install -d $(INCLUDEDIR)/eldap/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    39
 
-	install -m 644 eldap/*.hrl $(INCLUDEDIR)/eldap/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    40
 
-	install -d $(INCLUDEDIR)/mod_muc/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    41
 
-	install -m 644 mod_muc/*.hrl $(INCLUDEDIR)/mod_muc/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    42
 
-	install -d $(INCLUDEDIR)/mod_proxy65/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    43
 
-	install -m 644 mod_proxy65/*.hrl $(INCLUDEDIR)/mod_proxy65/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    44
 
-	install -d $(INCLUDEDIR)/mod_pubsub/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    45
 
-	install -m 644 mod_pubsub/*.hrl $(INCLUDEDIR)/mod_pubsub/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    46
 
-	install -d $(INCLUDEDIR)/web/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    47
 
-	install -m 644 web/*.hrl $(INCLUDEDIR)/web/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    48
 
+	ginstall -d $(INCLUDEDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    49
 
+	ginstall -m 644 *.hrl $(INCLUDEDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    50
 
+	ginstall -d $(INCLUDEDIR)/eldap/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    51
 
+	ginstall -m 644 eldap/*.hrl $(INCLUDEDIR)/eldap/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    52
 
+	ginstall -d $(INCLUDEDIR)/mod_muc/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    53
 
+	ginstall -m 644 mod_muc/*.hrl $(INCLUDEDIR)/mod_muc/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    54
 
+	ginstall -d $(INCLUDEDIR)/mod_proxy65/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    55
 
+	ginstall -m 644 mod_proxy65/*.hrl $(INCLUDEDIR)/mod_proxy65/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    56
 
+	ginstall -d $(INCLUDEDIR)/mod_pubsub/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    57
 
+	ginstall -m 644 mod_pubsub/*.hrl $(INCLUDEDIR)/mod_pubsub/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    58
 
+	ginstall -d $(INCLUDEDIR)/web/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    59
 
+	ginstall -m 644 web/*.hrl $(INCLUDEDIR)/web/
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    60
 
@@ -234,2 +234,2 @@
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    61
 
-	install -d $(PBINDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    62
 
-	install -m 750 $(O_USER) ../tools/captcha.sh $(PBINDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    63
 
+	ginstall -d $(PBINDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    64
 
+	ginstall -m 750 $(O_USER) ../tools/captcha.sh $(PBINDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    65
 
@@ -239,2 +239,2 @@
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    66
 
-	install -d $(SODIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    67
 
-	install -m 644 *.so $(SODIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    68
 
+	ginstall -d $(SODIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    69
 
+	ginstall -m 644 *.so $(SODIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    70
 
@@ -243,2 +243,2 @@
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    71
 
-	install -d $(MSGSDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    72
 
-	install -m 644 msgs/*.msg $(MSGSDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    73
 
+	ginstall -d $(MSGSDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    74
 
+	ginstall -m 644 msgs/*.msg $(MSGSDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    75
 
@@ -247,1 +247,1 @@
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    76
 
-	install -d -m 750 $(O_USER) $(SPOOLDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    77
 
+	ginstall -d -m 750 $(O_USER) $(SPOOLDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    78
 
@@ -253,1 +253,1 @@
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    79
 
-	install -d -m 750 $(O_USER) $(CTLLOCKDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    80
 
+	ginstall -d -m 750 $(O_USER) $(CTLLOCKDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    81
 
@@ -258,1 +258,1 @@
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    82
 
-	install -d -m 750 $(O_USER) $(LOGDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    83
 
+	ginstall -d -m 750 $(O_USER) $(LOGDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    84
 
@@ -263,5 +263,5 @@
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    85
 
-	install -d $(DOCDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    86
 
-	install -m 644 ../doc/dev.html $(DOCDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    87
 
-	install -m 644 ../doc/guide.html $(DOCDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    88
 
-	install -m 644 ../doc/*.png $(DOCDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    89
 
-	install -m 644 ../doc/*.txt $(DOCDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    90
 
+	ginstall -d $(DOCDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    91
 
+	ginstall -m 644 ../doc/dev.html $(DOCDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    92
 
+	ginstall -m 644 ../doc/guide.html $(DOCDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    93
 
+	ginstall -m 644 ../doc/*.png $(DOCDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    94
 
+	ginstall -m 644 ../doc/*.txt $(DOCDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    95
 
@@ -269,1 +269,1 @@
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    96
 
-		&& install -m 644 ../doc/guide.pdf $(DOCDIR) \
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    97
 
+		&& ginstall -m 644 ../doc/guide.pdf $(DOCDIR) \
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    98
 
@@ -271,1 +271,1 @@
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
    99
 
-	install -m 644 ../COPYING $(DOCDIR)
d9644516b4a8 7056173 move ejabberd to userland
Milan Jurik <Milan.Jurik@oracle.com>
parents:
diff changeset 
   100
 
+	ginstall -m 644 ../COPYING $(DOCDIR)
upstream/oracle/userland-gate