From a24945ac827f19e5d1aaa81f62ceb911646cf3b8 Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Thu, 17 Jun 2021 16:44:30 -0300 Subject: [PATCH] use DIST variable to see if el7 --- makefile | 2 +- packaging/el8/cockpit-navigator.spec | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index 50cefd4..5628621 100644 --- a/makefile +++ b/makefile @@ -21,7 +21,7 @@ all: default install: mkdir -p $(DESTDIR)/usr/share/cockpit/ cp -rpf navigator $(DESTDIR)/usr/share/cockpit -ifeq ($(EL7),1) +ifeq ($(DIST),"el7") sed -i "s/pf-c-button/btn/g;s/pf-m-primary/btn-primary/g;s/pf-m-secondary/btn-default/g;s/pf-m-danger/btn-danger/g" $(DESTDIR)/usr/share/cockpit/navigator/navigator.html endif diff --git a/packaging/el8/cockpit-navigator.spec b/packaging/el8/cockpit-navigator.spec index d46f995..98b37c9 100644 --- a/packaging/el8/cockpit-navigator.spec +++ b/packaging/el8/cockpit-navigator.spec @@ -21,9 +21,7 @@ A File System Browser for Cockpit. # empty %install -rm -rf %{buildroot} -mkdir -p %{buildroot} -cp -a * %{buildroot} +make DESTDIR=%{buildroot} DIST=%{dist} install %clean rm -rf %{buildroot}