24 SUBDIRS = $(PROTO_SUBDIRS) $(XPORT_SUBDIRS) $(MODULE_SUBDIRS_$(ISA)) |
24 SUBDIRS = $(PROTO_SUBDIRS) $(XPORT_SUBDIRS) $(MODULE_SUBDIRS_$(ISA)) |
25 |
25 |
26 diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile |
26 diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile |
27 --- a/usr/src/pkg/Makefile |
27 --- a/usr/src/pkg/Makefile |
28 +++ b/usr/src/pkg/Makefile |
28 +++ b/usr/src/pkg/Makefile |
29 @@ -47,8 +47,7 @@ |
29 @@ -47,7 +47,6 @@ |
30 MANIFEST_DOC = \ |
30 MFDIR_normal = manifests |
31 system-management-visual-panels-doc.mf |
31 MFDIR_wos = manifests_wos |
|
32 MFDIR=$(MFDIR_$(TYPE)) |
|
33 -BAGGAGE = baggage |
32 |
34 |
33 -MANIFESTS_i386 = \ |
35 publish := PKG_REPO = http://localhost:80 |
34 - system-management-visual-panels-hypervisor.mf |
|
35 +MANIFESTS_i386 = |
|
36 |
36 |
37 MANIFESTS = $(MANIFESTS_$(ISA)) \ |
37 @@ -81,14 +80,13 @@ |
38 $(MANIFEST_DOC) \ |
38 DYNAMIC_MANIFEST_wos = system-management-visual-panels.mf |
|
39 DYNAMIC_MANIFEST = $(DYNAMIC_MANIFEST_$(TYPE)) |
|
40 |
|
41 -STATIC_MDIRS = $(MFDIR) $(BAGGAGE) |
|
42 +STATIC_MDIRS = $(MFDIR) |
|
43 MDIRS = $(STATIC_MDIRS) $(SCRATCH) |
|
44 |
|
45 # This unfortunately gets executed a number of times. |
|
46 # Alternative implementations aren't much better. |
|
47 RMANIFESTS.cmd = $(MOG.filter) $(MFDIR)/*.mf |
|
48 -BAGGAGE.cmd = echo $(BAGGAGE)/*.mf |
|
49 -RMANIFESTS = $(RMANIFESTS.cmd:sh) $(BAGGAGE.cmd:sh) $(DYNAMIC_MANIFEST:%=$(SCRATCH)/%) |
|
50 +RMANIFESTS = $(RMANIFESTS.cmd:sh) $(DYNAMIC_MANIFEST:%=$(SCRATCH)/%) |
|
51 MANIFESTS.cmd = for i in $(RMANIFESTS); do basename $$i; done |
|
52 MANIFESTS = $(MANIFESTS.cmd:sh) |
|
53 |
|
54 @@ -126,9 +124,6 @@ |
|
55 # Rules for mogrifying package manifests whereever they may be found |
|
56 # |
|
57 |
|
58 -$(SCRATCH)/%.mog: $(SCRATCH) $(TRANSFORMS:%=transforms/%) $(BAGGAGE)/%.mf |
|
59 - $(MOG.mf) |
|
60 - |
|
61 $(SCRATCH)/%.mog: $(SCRATCH) $(TRANSFORMS:%=transforms/%) $(MFDIR)/%.mf |
|
62 $(MOG.mf) |
|
63 |