misc: update config script in IKEv2 test

[vpp.git] / extras / rpm / Makefile

diff --git a/extras/rpm/Makefile b/extras/rpm/Makefile
index 423c420..0c422c7 100644 (file)
--- a/extras/rpm/Makefile
+++ b/extras/rpm/Makefile
@@ -26,24 +26,21 @@ PC=%
 
 all: RPM
 
-# SUSE rolling-release (a.k.a. Tumbleweed)
-ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID))
-SPEC_FILE='vpp-suse.spec'
 # SUSE osleap15
-else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID))
-SPEC_FILE='vpp-suse.spec'
-# SUSE leap42.x
-else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
-SPEC_FILE='vpp-suse.spec'
+ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID))
+SRC_SPEC_DIR="opensuse"
 else
-SPEC_FILE='vpp.spec'
+SRC_SPEC_DIR="."
 endif
 
+SPEC_FILE='vpp.spec'
+
 spec:
        @echo $(TARBALL)
-       mkdir -p $(RPMBUILD)/{RPMS,SRPMS,BUILD,SOURCES,SPECS}
+       mkdir -p $(RPMBUILD)/RPMS $(RPMBUILD)/SRPMS $(RPMBUILD)/BUILD \
+             $(RPMBUILD)/SOURCES $(RPMBUILD)/SPECS
        cp $(TARBALL) $(RPMBUILD)/SOURCES/vpp-$(VERSION)-$(RELEASE).tar.xz
-       cp $(SPEC_FILE) $(RPMBUILD)/SPECS
+       cp $(SRC_SPEC_DIR)/$(SPEC_FILE) $(RPMBUILD)/SPECS
 
 srpm: spec
        rpmbuild -bs \