Re: [PATCH] restorecond: Fix consistancy of DESTDIR usage

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, May 31, 2018 at 5:34 PM, Nicolas Iooss <nicolas.iooss@xxxxxxx> wrote:
> On Thu, May 31, 2018 at 3:18 PM, Laurent Bigonville <bigon@xxxxxxxxxx> wrote:
>> From: Laurent Bigonville <bigon@xxxxxxxx>
>>
>> ---
>>  restorecond/Makefile | 14 +++++++-------
>>  1 file changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/restorecond/Makefile b/restorecond/Makefile
>> index 25be18d4..8a0ada1f 100644
>> --- a/restorecond/Makefile
>> +++ b/restorecond/Makefile
>> @@ -9,8 +9,8 @@ DBUSSERVICEDIR = $(PREFIX)/share/dbus-1/services
>>  SYSTEMDDIR ?= $(PREFIX)/lib/systemd
>>
>>  autostart_DATA = sealertauto.desktop
>> -INITDIR ?= $(DESTDIR)/etc/rc.d/init.d
>> -SELINUXDIR = $(DESTDIR)/etc/selinux
>> +INITDIR ?= /etc/rc.d/init.d
>> +SELINUXDIR = /etc/selinux
>>
>>  DBUSFLAGS = -DHAVE_DBUS $(shell $(PKG_CONFIG) --cflags dbus-glib-1)
>>  DBUSLIB = $(shell $(PKG_CONFIG) --libs dbus-glib-1)
>> @@ -42,11 +42,11 @@ install: all
>>         -mkdir -p $(DESTDIR)$(SBINDIR)
>>         install -m 755 restorecond $(DESTDIR)$(SBINDIR)
>>         install -m 644 restorecond.8 $(DESTDIR)$(MANDIR)/man8
>> -       -mkdir -p $(INITDIR)
>> -       install -m 755 restorecond.init $(INITDIR)/restorecond
>> -       -mkdir -p $(SELINUXDIR)
>> -       install -m 644 restorecond.conf $(SELINUXDIR)/restorecond.conf
>> -       install -m 644 restorecond_user.conf $(SELINUXDIR)/restorecond_user.conf
>> +       -mkdir -p $(DESTDIR)$(INITDIR)
>> +       install -m 755 restorecond.init $(DESTDIR)$(INITDIR)/restorecond
>> +       -mkdir -p $(DESTDIR)$(SELINUXDIR)
>> +       install -m 644 restorecond.conf $(DESTDIR)$(SELINUXDIR)/restorecond.conf
>> +       install -m 644 restorecond_user.conf $(DESTDIR)$(SELINUXDIR)/restorecond_user.conf
>>         -mkdir -p $(DESTDIR)$(AUTOSTARTDIR)
>>         install -m 644 restorecond.desktop $(DESTDIR)$(AUTOSTARTDIR)/restorecond.desktop
>>         -mkdir -p $(DESTDIR)$(DBUSSERVICEDIR)
>> --
>> 2.17.1
>
> Thanks for the new patch! I was not requiring a new version of the
> patch, but this one looks good to me (I "ack" it). I would like to
> give some time for other developers and package maintainers to comment
> on this patch (at least a day), in case we missed something obvious
> which would break with it, so I plan to merge it tomorrow of this
> week-end.
>
> Cheers,
> Nicolas

I have applied all the patches that you sent this week. Thanks!

Nicolas


_______________________________________________
Selinux mailing list
Selinux@xxxxxxxxxxxxx
To unsubscribe, send email to Selinux-leave@xxxxxxxxxxxxx.
To get help, send an email containing "help" to Selinux-request@xxxxxxxxxxxxx.



[Index of Archives]     [Selinux Refpolicy]     [Linux SGX]     [Fedora Users]     [Fedora Desktop]     [Yosemite Photos]     [Yosemite Camping]     [Yosemite Campsites]     [KDE Users]     [Gnome Users]

  Powered by Linux