[libvirt] [libvirt-php PATCH] Fix installation of libvirt-php.ini

[Daniel P. Berrange]

On Fri, May 11, 2012 at 05:31:28PM +0200, Ivo van den Abeelen wrote:
> Building/installing libvirt-php seems to create an incomplete libvirt-php.ini file.
> This patch solves this issue, and replaces the '#' comments (deprecated in PHP 5.4).
> ---
>  src/Makefile.am |   16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 4efd960..dd08d36 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -18,14 +18,14 @@ install-exec-local:
>  	$(INSTALL) -m 644 -D $(PACKAGE).so $(DESTDIR)$(PHPEDIR)/$(PACKAGE).so
>  	$(INSTALL) -m 755 -d $(DESTDIR)$(PHPCDIR)
>  	$(ECHO) "extension=$(PACKAGE).so" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> -	$(ECHO) > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> -	$(ECHO) "[libvirt"] > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> -	$(ECHO) "# Path to ISO images for VM installations" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> -	$(ECHO) "libvirt.iso_path=/var/lib/libvirt/images" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> -	$(ECHO) "# Path where disk images for new VMs should be created" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> -	$(ECHO) "libvirt.image_path=/var/lib/libvirt/images" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> -	$(ECHO) "# Limit maximum number of libvirt connections" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> -	$(ECHO) "libvirt.max_connections=5" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> +	$(ECHO) >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> +	$(ECHO) "[libvirt]" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> +	$(ECHO) "; Path to ISO images for VM installations" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> +	$(ECHO) "libvirt.iso_path=/var/lib/libvirt/images" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> +	$(ECHO) "; Path where disk images for new VMs should be created" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> +	$(ECHO) "libvirt.image_path=/var/lib/libvirt/images" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> +	$(ECHO) "; Limit maximum number of libvirt connections" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
> +	$(ECHO) "libvirt.max_connections=5" >> $(DESTDIR)$(PHPCDIR)/libvirt-php.ini
>  
>  uninstall-local:
>  	$(RM) -f $(DESTDIR)$(PHPCDIR)/$(PACKAGE).ini

ACK, obviously better than before :-)

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|