components/openca-ocspd/patches/02-makefile.patch
branchs11u3-sru
changeset 6363 052c5c0a107d
equal deleted inserted replaced
6362:94df57e11df8 6363:052c5c0a107d
       
     1 Patch origin: in-house
       
     2 Patch status: Solaris-specific; not suitable for upstream
       
     3 
       
     4 Need to set an appropriate etc directory path.
       
     5 
       
     6 Should not install an init script because Solaris uses an SMF service.
       
     7 
       
     8 Need to include $(top_srcdir)/src/ocspd/includes because not all headers are
       
     9 available in $(top_builddir)/src/ocspd/includes.
       
    10 
       
    11 --- openca-ocspd-3.1.2/etc/Makefile.in	2015-11-10 13:31:41.475359746 -0800
       
    12 +++ openca-ocspd-3.1.2/etc/Makefile.in	2016-03-04 13:30:46.052651164 -0800
       
    13 @@ -268,7 +268,7 @@
       
    14  top_srcdir = @top_srcdir@
       
    15  user = @user@
       
    16  TOP = ..
       
    17 -etc_prefix = $(DESTDIR)${exec_prefix}/etc
       
    18 +etc_prefix = $(DESTDIR)/etc
       
    19  lib_prefix = $(DESTDIR)@libdir@
       
    20  var_prefix = $(DESTDIR)${exec_prefix}/var
       
    21  doc_prefix = $(DESTDIR)${datadir}/openca-prqpd
       
    22 @@ -306,8 +306,6 @@
       
    23  $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
       
    24  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
       
    25  $(am__aclocal_m4_deps):
       
    26 -ocspd: $(top_builddir)/config.status $(srcdir)/ocspd.in
       
    27 -	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
       
    28  ocspd.xml: $(top_builddir)/config.status $(srcdir)/ocspd.xml.in
       
    29  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
       
    30  
       
    31 @@ -472,7 +470,6 @@
       
    32  install-data-local:
       
    33  	@$(NORMAL_INSTALL)
       
    34  	$(mkinstalldirs) $(etc_prefix); \
       
    35 -	$(mkinstalldirs) $(etc_prefix)/init.d; \
       
    36  	$(mkinstalldirs) $(etc_prefix)/ocspd; \
       
    37  	$(mkinstalldirs) $(etc_prefix)/ocspd/certs; \
       
    38  	$(mkinstalldirs) $(etc_prefix)/ocspd/crls; \
       
    39 @@ -487,8 +484,6 @@
       
    40  	      $(INSTALL_DATA) $$file $(etc_prefix)/ocspd; \
       
    41  	    fi \
       
    42  	  done ;
       
    43 -	@ $(INSTALL_DATA) ocspd $(etc_prefix)/init.d/; \
       
    44 -	$(CHMOD) +x $(etc_prefix)/init.d/ocspd ;
       
    45  	@for file in token.d/*.xml ; do \
       
    46  	    if test -f $$file ; then \
       
    47  		$(INSTALL_DATA) $$file $(etc_prefix)/ocspd/pki/token.d ; \
       
    48 --- openca-ocspd-3.1.2/src/ocspd/Makefile.in	Tue Nov 10 13:31:41 2015
       
    49 +++ openca-ocspd-3.1.2/src/ocspd/Makefile.in	Wed Jan 27 14:36:14 2016
       
    50 @@ -118,7 +118,7 @@
       
    51  am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
       
    52  am__v_at_0 = @
       
    53  am__v_at_1 = 
       
    54 -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/ocspd/includes
       
    55 +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/ocspd/includes  -I$(top_srcdir)/src/ocspd/includes
       
    56  depcomp = $(SHELL) $(top_srcdir)/build/depcomp
       
    57  am__depfiles_maybe = depfiles
       
    58  am__mv = mv -f