[svn-commits] pabelanger: branch pabelanger/non-root r262017 - in /team/pabelanger/non-root...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri May 7 19:19:49 CDT 2010
Author: pabelanger
Date: Fri May 7 19:19:45 2010
New Revision: 262017
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=262017
Log:
Install with proper permissions.
Modified:
team/pabelanger/non-root/Makefile
team/pabelanger/non-root/configure
team/pabelanger/non-root/include/asterisk/autoconfig.h.in
team/pabelanger/non-root/makeopts.in
Modified: team/pabelanger/non-root/Makefile
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/Makefile?view=diff&rev=262017&r1=262016&r2=262017
==============================================================================
--- team/pabelanger/non-root/Makefile (original)
+++ team/pabelanger/non-root/Makefile Fri May 7 19:19:45 2010
@@ -124,6 +124,13 @@
# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
DEBUG=-g3
+ifneq ($AST_USER,)
+ INSTALL+= -o $(AST_USER)
+endif
+
+ifneq ($AST_GROUP,)
+ INSTALL+= -g $(AST_GROUP)
+endif
# Define standard directories for various platforms
# These apply if they are not redefined in asterisk.conf
@@ -637,7 +644,30 @@
@exit 1
endif
-install: badshell datafiles bininstall
+permissions:
+ if [ "$(AST_USER)" != "" ] ; then \
+ chown -R $(AST_USER) $(DESTDIR)$(ASTETCDIR) ; \
+ chown -R $(AST_USER) $(DESTDIR)$(MODULES_DIR) ; \
+ chown -R $(AST_USER) $(DESTDIR)$(ASTVARLIBDIR) ; \
+ chown -R $(AST_USER) $(DESTDIR)$(ASTDBDIR) ; \
+ chown -R $(AST_USER) $(DESTDIR)$(ASTDATADIR) ; \
+ chown -R $(AST_USER) $(DESTDIR)$(AGI_DIR) ; \
+ chown -R $(AST_USER) $(DESTDIR)$(ASTSPOOLDIR) ; \
+ chown -R $(AST_USER) $(DESTDIR)$(ASTLOGDIR) ; \
+ fi
+
+ if [ "$(AST_GROUP)" != "" ] ; then \
+ chgrp -R $(AST_GROUP) $(DESTDIR)$(ASTETCDIR) ; \
+ chgrp -R $(AST_GROUP) $(DESTDIR)$(MODULES_DIR) ; \
+ chgrp -R $(AST_GROUP) $(DESTDIR)$(ASTVARLIBDIR) ; \
+ chgrp -R $(AST_GROUP) $(DESTDIR)$(ASTDBDIR) ; \
+ chgrp -R $(AST_GROUP) $(DESTDIR)$(ASTDATADIR) ; \
+ chgrp -R $(AST_GROUP) $(DESTDIR)$(AGI_DIR) ; \
+ chgrp -R $(AST_GROUP) $(DESTDIR)$(ASTSPOOLDIR) ; \
+ chgrp -R $(AST_GROUP) $(DESTDIR)$(ASTLOGDIR) ; \
+ fi
+
+install: badshell datafiles bininstall permissions
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
fi
@@ -742,7 +772,7 @@
webvmail:
@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
@[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
- $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
+ $(INSTALL) -m 4755 contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
for x in images/*.gif; do \
$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
Modified: team/pabelanger/non-root/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/include/asterisk/autoconfig.h.in?view=diff&rev=262017&r1=262016&r2=262017
==============================================================================
--- team/pabelanger/non-root/include/asterisk/autoconfig.h.in (original)
+++ team/pabelanger/non-root/include/asterisk/autoconfig.h.in Fri May 7 19:19:45 2010
@@ -962,7 +962,7 @@
/* Define to 1 if you have the `strtoq' function. */
#undef HAVE_STRTOQ
-/* Define to 1 if `st_blksize' is member of `struct stat'. */
+/* Define to 1 if `struct stat' is a member of `st_blksize'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
/* Define to 1 if you have the mISDN Supplemental Services library. */
@@ -1293,11 +1293,11 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
/* Define to necessary symbol if this constant uses a non-standard name on
your system. */
@@ -1317,11 +1317,6 @@
/* Define to the type of arg 5 for `select'. */
#undef SELECT_TYPE_ARG5
-
-/* Define to 1 if the `setvbuf' function takes the buffering type as its
- second argument and the buffer pointer as the third, as on System V before
- release 3. */
-#undef SETVBUF_REVERSED
/* The size of `char *', as computed by sizeof. */
#undef SIZEOF_CHAR_P
@@ -1352,20 +1347,30 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
-/* Define to 1 if on AIX 3.
- System headers sometimes define this.
- We just want to avoid a redefinition error message. */
+/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
#undef _LARGEFILE_SOURCE
@@ -1382,20 +1387,6 @@
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
-
-/* Enable extensions on Solaris. */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
Modified: team/pabelanger/non-root/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/non-root/makeopts.in?view=diff&rev=262017&r1=262016&r2=262017
==============================================================================
--- team/pabelanger/non-root/makeopts.in (original)
+++ team/pabelanger/non-root/makeopts.in Fri May 7 19:19:45 2010
@@ -78,6 +78,9 @@
AST_SHADOW_WARNINGS=@AST_SHADOW_WARNINGS@
AST_FORTIFY_SOURCE=@AST_FORTIFY_SOURCE@
+AST_USER=@AST_USER@
+AST_GROUP=@AST_GROUP@
+
ALSA_INCLUDE=@ALSA_INCLUDE@
ALSA_LIB=@ALSA_LIB@
More information about the svn-commits
mailing list