From 768dcfbe2318d22f5e39deac17bf96922f7f2092 Mon Sep 17 00:00:00 2001
From: Adam Stevko <adam.stevko@gmail.com>
Date: Fri, 1 Apr 2016 20:43:14 +0200
Subject: [PATCH] Move zip to archiver category

---
 components/{ => archiver}/zip/Makefile                        | 10 +++++-----
 components/{ => archiver}/zip/info-zip.license                |  0
 components/{ => archiver}/zip/patches/00-unix-configure.patch |  0
 components/{ => archiver}/zip/patches/01_zipnote.patch        |  0
 components/{ => archiver}/zip/resolve.deps                    |  0
 components/{ => archiver}/zip/zip.p5m                         |  0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename components/{ => archiver}/zip/Makefile (90%)
 rename components/{ => archiver}/zip/info-zip.license (100%)
 rename components/{ => archiver}/zip/patches/00-unix-configure.patch (100%)
 rename components/{ => archiver}/zip/patches/01_zipnote.patch (100%)
 rename components/{ => archiver}/zip/resolve.deps (100%)
 rename components/{ => archiver}/zip/zip.p5m (100%)

diff --git a/components/zip/Makefile b/components/archiver/zip/Makefile
similarity index 90%
rename from components/zip/Makefile
rename to components/archiver/zip/Makefile
index 2f9bc7c6c..a9be50733 100644
--- a/components/zip/Makefile
+++ b/components/archiver/zip/Makefile
@@ -22,7 +22,7 @@
 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
-include ../../make-rules/shared-macros.mk
+include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		zip
 COMPONENT_VERSION=	3.0
@@ -36,9 +36,9 @@ COMPONENT_BUGDB=	utility/zip
 
 LD_OPTIONS=
 
-include ../../make-rules/prep.mk
-include ../../make-rules/justmake.mk
-include ../../make-rules/ips.mk
+include $(WS_TOP)/make-rules/prep.mk
+include $(WS_TOP)/make-rules/justmake.mk
+include $(WS_TOP)/make-rules/ips.mk
 
 # remove the unwanted file.
 COMPONENT_PREP_ACTION = rm -f $(SOURCE_DIR)/match.S
@@ -61,6 +61,6 @@ test:		$(NO_TESTS)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+include $(WS_TOP)/make-rules/depend.mk
 
 
diff --git a/components/zip/info-zip.license b/components/archiver/zip/info-zip.license
similarity index 100%
rename from components/zip/info-zip.license
rename to components/archiver/zip/info-zip.license
diff --git a/components/zip/patches/00-unix-configure.patch b/components/archiver/zip/patches/00-unix-configure.patch
similarity index 100%
rename from components/zip/patches/00-unix-configure.patch
rename to components/archiver/zip/patches/00-unix-configure.patch
diff --git a/components/zip/patches/01_zipnote.patch b/components/archiver/zip/patches/01_zipnote.patch
similarity index 100%
rename from components/zip/patches/01_zipnote.patch
rename to components/archiver/zip/patches/01_zipnote.patch
diff --git a/components/zip/resolve.deps b/components/archiver/zip/resolve.deps
similarity index 100%
rename from components/zip/resolve.deps
rename to components/archiver/zip/resolve.deps
diff --git a/components/zip/zip.p5m b/components/archiver/zip/zip.p5m
similarity index 100%
rename from components/zip/zip.p5m
rename to components/archiver/zip/zip.p5m
-- 
2.11.4.GIT