--001636c5acf8860df2046a67b0c2
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
>> I was making a Solaris Nagios package and have edited the Nagios
>> Makefile.in as below.
> I can't quite make sense of the diff format,
Oh yes a U diff is much more sensible, I have attached a copy.
Also there are some commands to copy 'sample-config/template-object'
files I have removed them from my Makefile but not included them in
the diff, not sure if they _should_ exist.
these are them:
$(INSTALL) -m 664 sample-config/template-object/bigger.cfg
$(PACKDIR)$(CFGDIR)/bigger.cfg.$(VERSION)
$(INSTALL) -m 664 sample-config/template-object/minimal.cfg
$(PACKDIR)$(CFGDIR)/minimal.cfg.$(VERSION)
$(INSTALL) -m 664 sample-config/template-object/checkcommands.cfg
$(PACKDIR)$(CFGDIR)/checkcommands.cfg.$(VERSION)
$(INSTALL) -m 664 sample-config/template-object/misccommands.cfg
$(PACKDIR)$(CFGDIR)/misccommands.cfg.$(VERSION)
Ritchie
--001636c5acf8860df2046a67b0c2
Content-Type: text/x-patch; charset=US-ASCII;
name="Nagios-3.0.6.Makefile.in.diff"
Content-Disposition: attachment; filename="Nagios-3.0.6.Makefile.in.diff"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_fuz6i0tg0
LS0tIE1ha2VmaWxlLmluCVN1biBBcHIgMTMgMTk6MzQ6MjYgMjAwOAorKysgLi4vLi4vbmFnaW9z
LTMuMC42L01ha2VmaWxlLmluCVdlZCBNYXkgMjAgMTU6MTM6MDggMjAwOQpAQCAtMjgyLDYgKzI4
Miw4IEBACiAjIFNvbGFyaXMgcGtnbWsKIFBBQ0tESVI9QFBBQ0tESVJACiBWRVJTSU9OPUBWRVJT
SU9OQAorU1VOX09TX1JFTEVBU0U9JChzaGVsbCB1bmFtZSAtciB8IGN1dCAtZjIgLWQuICkKK1NV
Tl9QTEFURk9STT0kKHNoZWxsIHVuYW1lIC1wKQogCiBQcm90b3R5cGU6CiAJaWYgWyAhIC1kICQo
UEFDS0RJUikgXSA7IHRoZW4gbWtkaXIgJChQQUNLRElSKTsgZmkKQEAgLTI5OSw2ICszMDEsNyBA
QAogCSQoSU5TVEFMTCkgLW0gNjY0IHNhbXBsZS1jb25maWcvdGVtcGxhdGUtb2JqZWN0L21pc2Nj
b21tYW5kcy5jZmcgJChQQUNLRElSKSQoQ0ZHRElSKS9taXNjY29tbWFuZHMuY2ZnLiQoVkVSU0lP
TikKIAljZCBjb250cmliOyAkKE1BS0UpIGFsbDsgJChNQUtFKSBERVNURElSPSQoUEFDS0RJUikg
SU5JVF9PUFRTPScnIElOU1RBTExfT1BUUz0nJyBDT01NQU5EX09QVFM9JycgbmFnaW9zX2dycD0n
JyBuYWdpb3NfdXNyPScnIGluc3RhbGwKIAllY2hvIGkgcGtnaW5mbz4gUHJvdG90eXBlCisJaWYg
WyAtZiBjaGVja2luc3RhbGwuaW4gXSA7IHRoZW4gY2F0IGNoZWNraW5zdGFsbC5pbiB8IHNlZCAn
cy8hU1VOX1BMQVRGT1JNIS8kKFNVTl9QTEFURk9STSkvZycgPmNoZWNraW5zdGFsbDsgZmkKIAlp
ZiBbIC1mIGNoZWNraW5zdGFsbCBdIDsgdGhlbiBlY2hvIGkgY2hlY2tpbnN0YWxsPj4gUHJvdG90
eXBlOyBmaQogCWlmIFsgLWYgcHJlaW5zdGFsbCBdIDsgdGhlbiBlY2hvIGkgcHJlaW5zdGFsbD4+
IFByb3RvdHlwZTsgZmkKIAlpZiBbIC1mIHBvc3RpbnN0YWxsIF0gOyB0aGVuIGVjaG8gaSBwb3N0
aW5zdGFsbD4+IFByb3RvdHlwZTsgZmkKQEAgLTMwOCwxMCArMzExLDE1IEBACiAJbWtkaXIgJChQ
QUNLRElSKS9uYWdpb3MKIAlwa2dtayAtbyAtciAvIC1mIFByb3RvdHlwZSAtZCAkKFBBQ0tESVIp
IG5hZ2lvcwogCi1uYWdpb3MuU1BBUkMucGtnLnRhci5nejogcGtnL25hZ2lvcy9wa2dtYXAKLQlj
ZCAkKFBBQ0tESVIpICYmIHRhciAtY2YgLSBuYWdpb3MgfCBnemlwIC05IC1jID4gLi4vbmFnaW9z
LlNQQVJDLnBrZy50YXIuZ3oKK25hZ2lvcy5zdW4ucGtnLnRhci5nejogcGtnL25hZ2lvcy9wa2dt
YXAKKwljZCAkKFBBQ0tESVIpICYmIHRhciAtY2YgLSBuYWdpb3MgfCBnemlwIC05IC1jID4gLi4v
bmFnaW9zLSQoVkVSU0lPTiktU29sJChTVU5fT1NfUkVMRUFTRSktJChTVU5fUExBVEZPUk0pLnBr
Zy50YXIuZ3oKIAotcGtnc2V0OiBuYWdpb3MuU1BBUkMucGtnLnRhci5negorbmFnaW9zLnN1bi5w
a2c6IHBrZy9uYWdpb3MvcGtnbWFwCisJcGtndHJhbnMgLXMgJChQQUNLRElSKSAuLi9uYWdpb3Mt
JChWRVJTSU9OKS1Tb2wkKFNVTl9PU19SRUxFQVNFKS0kKFNVTl9QTEFURk9STSkucGtnIG5hZ2lv
cwogCitwa2dzZXR0YXI6IG5hZ2lvcy5zdW4ucGtnLnRhci5negorCitwa2dzZXQ6IG5hZ2lvcy5z
dW4ucGtnCisKIHBrZ2NsZWFuOgotCXJtIC1yZiBwa2cgUHJvdG90eXBlIG5hZ2lvcy5TUEFSQy5w
a2cudGFyLmd6CisJcm0gLXJmIHBrZyBQcm90b3R5cGUgbmFnaW9zLSQoVkVSU0lPTiktJChTVU5f
UExBVEZPUk0pLnBrZy50YXIuZ3oK
--001636c5acf8860df2046a67b0c2--
This post was automatically imported from historical nagios-devel mailing list archives
Original poster: [email protected]